proceso 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba2fac203e9bf0d1bec8ad20defc3ff07582c5f
-  data.tar.gz: a40f55f136b868bd641129c5c8680feb2e3855d6
+  metadata.gz: a49a83d9db144438ccca258b165644e93e14183a
+  data.tar.gz: 93e182fa67298287a5402c2a553376c5d1c07f6e
 SHA512:
-  metadata.gz: c9d453e1d265a4d3625328733ceadc4cbc26a34cd22c90cf131512ca1f57caf5fcabb54da937953a4c14802c17221f59f149bd588249541a3ebaa02b4c548dfd
-  data.tar.gz: d914eddb8fe44c1fdafaf6c73b689481f7a94c9b06b26e1ee66d738d4120dc910958b227227a4a7b528e4994abb7f06a0d593a35874dc35a24e17c949b16872a
+  metadata.gz: 93e7588f3a630b729754c764fe238307353c8401f6de24575a19b12082821a91be4c9e67bbc4bd0b123e601e07373884a0a622084a270d71c507087d5dcf7757
+  data.tar.gz: 9c56ba0567d6901430dd26fee225b93fef0fe93a7bdc3445d1c210011725bb2b13e113781f6b7368e621bb587ff77bdeea5094fcd5e63b46a9f7744cea21fde0

data/ext/proceso/darwin.c

@@ -37,33 +37,4 @@ int rb_process_info(int pid, int flavor, void *pti, int size) {
   }
 }
 
-/* List of Processes */
-int * rb_process_list() {
-  int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0};
-  size_t buf_size;
-  int ret;
-  int list[4096];
-  ret = sysctl(mib, 4, NULL, &buf_size, NULL, 0);
-  if (ret >= 0) {
-    struct kinfo_proc *processes = NULL;
-    int i, nb_entries;
-    nb_entries = buf_size / sizeof(struct kinfo_proc);
-    processes = (struct kinfo_proc*) malloc(buf_size);
-    if (processes != NULL) {
-      ret = sysctl(mib, 4, processes, &buf_size, NULL, 0);
-      if (ret >= 0) {
-        for (i = 0; i < nb_entries; i++) {
-          int pid = processes[i].kp_proc.p_pid;
-          list[i] = pid;
-        }
-        free(processes);
-        return list;
-      }
-      free(processes);
-      return 0;
-    }
-  }
-  return 0;
-}
-
 #endif

data/ext/proceso/darwin.h

@@ -14,5 +14,4 @@
 
 int rb_sysctl_kern_argmax();
 int rb_sysctl_kern_procargs2(int pid, char **process_name, int argmax, size_t buf_size);
-int rb_process_info(int pid, int flavor, void *pti, int size);
-int * rb_process_list();
+int rb_process_info(int pid, int flavor, void *pti, int size);

data/ext/proceso/pid.c

@@ -57,19 +57,6 @@ proceso__process_system_cpu(VALUE self) {
   return rb_float_new(val);
 }
 
-/* PID CPU Usage */
-static VALUE
-proceso__process_cpu_usage(VALUE self) {
-  int ncpu = rb_hw_ncpu();
-  float u1, u2;
-  float usage;
-  u1 = rb_process_cpu_times(iv2pid(self), FCPU_USR);
-  usleep(100000);
-  u2 = rb_process_cpu_times(iv2pid(self), FCPU_USR);
-  usage = ncpu * ((u2 - u1) * 100);
-  return rb_float_new(usage);
-}
-
 void Init__proceso_pid() {
 
   VALUE rb_mProceso  = rb_define_module("Proceso");
@@ -82,6 +69,5 @@ void Init__proceso_pid() {
   rb_define_method(rb_cProcesoPID, "virtual_size", proceso__process_vms, 0);
   rb_define_method(rb_cProcesoPID, "user_cpu_times", proceso__process_user_cpu, 0);
   rb_define_method(rb_cProcesoPID, "system_cpu_times", proceso__process_system_cpu, 0);
-  rb_define_method(rb_cProcesoPID, "cpu_usage", proceso__process_cpu_usage, 0);
 
 }

data/ext/proceso/proceso.c

@@ -6,30 +6,12 @@ int iv2pid(VALUE self) {
   return FIX2INT(rb_iv_get(self, "@pid"));
 }
 
-#ifdef __APPLE__
-/* Process PIDs */
-static VALUE
-proceso__pids(VALUE self) {
-  int *pids = rb_process_list();
-  VALUE processes = rb_ary_new();
-  int i;
-  for(i = 0; i < sizeof(pids); i++) {
-    rb_ary_push(processes, INT2NUM(pids[i]));
-  }
-  return processes;
-}
-#endif
-
 void Init_proceso() {
 
   rb_mProceso        = rb_define_module("Proceso");
 
   rb_define_const(rb_mProceso, "NCPU", INT2NUM(rb_hw_ncpu()));
 
-#ifdef __APPLE__
-  rb_define_singleton_method(rb_mProceso, "pids", proceso__pids, 0);
-#endif
-
   Init__proceso_pid();
 }
 

data/lib/proceso/version.rb

@@ -1,3 +1,3 @@
 module Proceso
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/proceso.rb

@@ -4,26 +4,8 @@ require 'proceso/pid'
 module Proceso
   extend self
 
-  if RUBY_PLATFORM =~ /linux/
-    def pids
-      Dir["/proc/*"].select do
-        |x| x =~ /\/\d+$/
-      end.map(&File.method(:basename)).map(&:to_i)
-    end
-  end
-
-  def processes
-    pids.map do |i|
-      Proceso::PID.new(i)
-    end
-  end
-
   def current
     @current ||= Proceso::PID.new(Process.pid)
   end
 
 end
-
-if defined?(Rails) || defined?(Rack)
-  require 'proceso/middleware'
-end

data/spec/proceso/pid_spec.rb

@@ -40,12 +40,6 @@ describe Proceso::PID do
     process.virtual_size.should == 100
   end
 
-  it "should return cpu usage" do
-    process.cpu_usage.should be_kind_of(Float)
-    process.stub(:cpu_usage).and_return(0.1)
-    process.cpu_usage.should == 0.1
-  end
-
   it "should return user cpu times" do
     process.user_cpu_times.should be_kind_of(Float)
     process.stub(:user_cpu_times).and_return(0.1)

data/spec/proceso_spec.rb

@@ -6,15 +6,6 @@ describe Proceso do
      Proceso::NCPU.should_not == 0
   end
 
-  it "should return list of pids" do
-    Proceso.pids.should be_kind_of(Array)
-  end
-
-  it "should return list of Proceso::PID objects" do
-    Proceso.processes.should be_kind_of(Array)
-    Proceso.processes.last.should be_kind_of(Proceso::PID)
-  end
-
   it "should return current process" do
     Proceso.current.should_not be_nil
     Proceso.current.pid.should == Process.pid

data/spec/spec_helper.rb

@@ -2,4 +2,5 @@ require 'bundler/setup'
 lib_path = File.join(File.dirname(__FILE__), "..", "lib")
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
 
+require 'debugger'
 require "proceso"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proceso
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Goines
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -88,7 +88,6 @@ extensions:
 - ext/proceso/extconf.rb
 extra_rdoc_files: []
 files:
-- lib/proceso/middleware.rb
 - lib/proceso/pid.rb
 - lib/proceso/version.rb
 - lib/proceso.rb
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple process information gather

data/lib/proceso/middleware.rb

@@ -1,71 +0,0 @@
-require 'rack'
-
-module Proceso
-  class Middleware
-
-    SUBSCRIPTION = 'proceso.usage'
-
-    def self.report
-      subscribe do |name, start, finish, id, payload|
-        puts
-        puts "******* PROCESO INFORMATION *******"
-        mem_used    = (payload[:mem_used].to_f / 1024.0).round(1)
-        cpu_used    = payload[:cpu_used].to_f.round(1)
-        path        = payload[:request].path_info
-        resp_time   = payload[:resp_time]
-        puts "MEM: #{mem_used}KB CPU: #{cpu_used} RESP: #{resp_time}ms PATH: #{path}"
-        puts "******* END OF PROCESO INFORMATION *******"
-        puts
-      end
-    end
-
-    def self.subscribe(&blk)
-      return unless defined?(ActiveSupport::Notifications)
-      ActiveSupport::Notifications.subscribe(SUBSCRIPTION, &blk)
-    end
-
-    attr_reader :app, :pid, :notifier
-
-    def initialize(app)
-      @app = app
-      @notifier ||= ActiveSupport::Notifications if defined?(ActiveSupport::Notifications)
-      @pid = Process.pid
-    end
-
-    def call(env)
-      measure_process_usage(env) do
-        @app.call(env)
-      end
-    end
-
-    def measure_process_usage(env)
-      mem_1   = process.mem_size
-      cpu_1   = process.user_cpu_times
-      resp_1  = Time.now.to_i
-      response = yield
-      mem_2 = process.mem_size
-      cpu_2 = process.user_cpu_times
-      resp_2  = Time.now.to_i
-      process_usage = process_info(env, (mem_2 - mem_1), (cpu_2 - cpu_1), (resp_2 - resp_1))
-      notifier.instrument(SUBSCRIPTION, process_usage)
-      response
-    end
-
-    def process_info(env, mem_used, cpu_used, resp_time)
-      req = Rack::Request.new(env)
-      {
-        pid: process.pid,
-        mem_used: mem_used,
-        cpu_used: cpu_used,
-        resp_time: resp_time,
-        request: req
-      }
-    end
-
-    def process
-      @process ||= Proceso::PID.new(pid)
-    end
-
-  end
-end
-