sys-proctable 0.9.1-universal-darwin → 0.9.2-universal-darwin

data/CHANGES

@@ -1,3 +1,11 @@
+== 0.9.2 - 8-Oct-2012
+* Added cmdline support for OS X. Thanks go to Matthias Zirnstein for
+  the patch.
+* Warning cleanup for 1.9.
+* Updated the gem platform handling. Replaced the borked string approach
+  with a two element array for Gem::Platform.new.
+* MS date strings are now parse with DateTime instead of Date.
+
 == 0.9.1 - 3-Aug-2011
 * Added the pctcpu and pctmem members for Linux.
 * Added Errno::ESRCH to a rescue clause on Linux that fixed a bug

data/README

@@ -20,6 +20,7 @@
   gem install sys-proctable --platform mswin32 # Windows
   gem install sys-proctable --platform sunos   # Solaris
   gem install sys-proctable --platform linux   # Linux
+  gem install sys-proctable --platform freebsd # BSD (any flavor)
 
 == Synopsis
   require 'sys/proctable'
@@ -58,15 +59,6 @@
   The cmdline member on Solaris is limited to 80 characters unless you (or
   your program) own the process. This is a Solaris design flaw/feature.
 
-=== OS X
-  At the moment you do not get the full command line string. The code required
-  to get this information is obnoxious and I don't have any compelling desire
-  to add it. However, if you're willing to submit a patch I'll accept it.
-
-  You can find a good starting point with the OS X code found in Dan Urist's
-  Proc::ProcessTable module. You can find that module on CPAN. Point your
-  browser at http://search.cpan.org.
-
 === Thread Safety
   I am not currently using a thread-safe version of readdir() for versions
   of this library that use C. I am not especially concerned about it either.
@@ -94,7 +86,8 @@
   euid, gid and guid info in the Linux version, along with some general
   debugging help.
    
-  Thanks go to David Felstead for the original OS X code.
+  Thanks go to David Felstead for the original OS X code. Thanks also go
+  to Matthias Zirnstein for adding cmdline support for OS X.
 
   Finally I'd like to thank all the folks who have submitted bug reports
   and/or patches.
@@ -112,7 +105,7 @@
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2010 Daniel J. Berger
+  (C) 2003-2012 Daniel J. Berger
   All Rights Reserved.
 
 == Author

data/Rakefile

@@ -2,12 +2,13 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
-include Config
+include RbConfig
 
 CLEAN.include(
   '**/*.core',              # Core dump files
   '**/*.gem',               # Gem files
   '**/*.rbc',               # Rubinius
+  '.rbx', '**/*/.rbx',      # Rubinius
   '**/*.o',                 # C object file
   '**/*.log',               # Ruby extension build log
   '**/Makefile',            # C Makefile
@@ -17,7 +18,7 @@ CLEAN.include(
 
 desc 'Build the sys-proctable library for C versions of sys-proctable'
 task :build => [:clean] do
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /bsd/i
       dir = 'ext/bsd'
     when /darwin/i
@@ -26,11 +27,11 @@ task :build => [:clean] do
       dir = 'ext/hpux'
   end
 
-  unless Config::CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
+  unless CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
     Dir.chdir(dir) do
       ruby 'extconf.rb'
       sh 'make'
-      cp 'proctable.' + Config::CONFIG['DLEXT'], 'sys'
+      cp 'proctable.' + CONFIG['DLEXT'], 'sys'
     end
   end
 end
@@ -38,11 +39,11 @@ end
 desc 'Install the sys-proctable library'
 task :install => [:build] do
   file = nil
-  dir  = File.join(Config::CONFIG['sitelibdir'], 'sys')
+  dir  = File.join(CONFIG['sitelibdir'], 'sys')
 
   Dir.mkdir(dir) unless File.exists?(dir)
 
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /mswin|win32|msdos|cygwin|mingw|windows/i
       file = 'lib/windows/sys/proctable.rb'
     when /linux/i
@@ -62,13 +63,13 @@ end
 
 desc 'Uninstall the sys-proctable library'
 task :uninstall do
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
-      dir  = File.join(Config::CONFIG['sitelibdir'], 'sys')
+      dir  = File.join(CONFIG['sitelibdir'], 'sys')
       file = File.join(dir, 'proctable.rb')
     else
-      dir  = File.join(Config::CONFIG['sitearchdir'], 'sys')
-      file = File.join(dir, 'proctable.' + Config::CONFIG['DLEXT'])
+      dir  = File.join(CONFIG['sitearchdir'], 'sys')
+      file = File.join(dir, 'proctable.' + CONFIG['DLEXT'])
   end
 
   rm(file) 
@@ -89,7 +90,7 @@ Rake::TestTask.new do |t|
   task :test => :build
   t.libs << 'test' << '.'
    
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /mswin|msdos|cygwin|mingw|windows/i
       t.test_files = FileList['test/test_sys_proctable_windows.rb']
       t.libs << 'lib/windows'
@@ -120,46 +121,46 @@ namespace :gem do
     # in order to get the universal platform settings I want because
     # of some bugginess in Rubygems' platform.rb.
     #
-    case Config::CONFIG['host_os']
+    case CONFIG['host_os']
       when /bsd/i
-         spec.platform = Gem::Platform.new('universal-bsd')
+         spec.platform = Gem::Platform.new(['universal', 'freebsd'])
+         spec.platform.version = nil
          spec.files << 'ext/bsd/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/bsd/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_bsd.rb'
          spec.extensions = ['ext/bsd/extconf.rb']
       when /darwin/i
-         spec.platform = Gem::Platform.new('universal-darwin')
+         spec.platform = Gem::Platform.new(['universal', 'darwin'])
          spec.files << 'ext/darwin/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/darwin/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_darwin.rb'
          spec.extensions = ['ext/darwin/extconf.rb']
       when /hpux/i
-         spec.platform = Gem::Platform.new('universal-hpux')
+         spec.platform = Gem::Platform.new(['universal', 'hpux'])
          spec.files << 'ext/hpux/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/hpux/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_hpux.rb'
          spec.extensions = ['ext/hpux/extconf.rb']
       when /linux/i
-         spec.platform = Gem::Platform.new('universal-linux')
+         spec.platform = Gem::Platform.new(['universal', 'linux'])
          spec.require_paths = ['lib', 'lib/linux']
          spec.files += ['lib/linux/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_linux.rb'
       when /sunos|solaris/i
-         spec.platform = Gem::Platform.new('universal-solaris10.0')
-         spec.platform.version = nil
+         spec.platform = Gem::Platform.new(['universal', 'solaris'])
          spec.require_paths = ['lib', 'lib/sunos']
          spec.files += ['lib/sunos/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_sunos.rb'
       when /mswin|win32|dos|cygwin|mingw|windows/i
-         spec.platform = Gem::Platform::CURRENT
-         spec.platform.cpu = 'universal'
-         spec.platform.version = nil
+         spec.platform = Gem::Platform.new(['universal', 'mingw'])
          spec.require_paths = ['lib', 'lib/windows']
          spec.files += ['lib/windows/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_windows.rb'
     end
-
+ 
+    # https://github.com/rubygems/rubygems/issues/147
     spec.original_platform = spec.platform
+
     Gem::Builder.new(spec).build
   end
 

data/ext/darwin/sys/proctable.c

@@ -13,7 +13,12 @@
 #include <sys/user.h>
 #include <errno.h>
 
-#define SYS_PROCTABLE_VERSION "0.9.1"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define pid_of(pproc) pproc->kp_proc.p_pid
+
+#define SYS_PROCTABLE_VERSION "0.9.2"
 
 #define PROC_MIB_LEN 4
 #define ARGS_MIB_LEN 3
@@ -28,6 +33,160 @@ const char* fields[] = {
    "nivcsw", "utime", "stime"
 };
 
+int argv_of_pid(int pid, char* cmdline) {
+  int    mib[3], argmax, nargs, c = 0;
+  size_t    size;
+  char    *procargs, *sp, *np, *cp;
+  int show_args = 1;
+
+  /* fprintf(stderr, "Getting argv of PID %d\n", pid); */
+
+  mib[0] = CTL_KERN;
+  mib[1] = KERN_ARGMAX;
+
+  size = sizeof(argmax);
+  if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1) {
+    goto ERROR_A;
+  }
+
+  /* Allocate space for the arguments. */
+  procargs = (char *)malloc(argmax);
+  if (procargs == NULL) {
+    goto ERROR_A;
+  }
+
+
+  /*
+   * Make a sysctl() call to get the raw argument space of the process.
+   * The layout is documented in start.s, which is part of the Csu
+   * project.  In summary, it looks like:
+   *
+   * /---------------\ 0x00000000
+   * :               :
+   * :               :
+   * |---------------|
+   * | argc          |
+   * |---------------|
+   * | arg[0]        |
+   * |---------------|
+   * :               :
+   * :               :
+   * |---------------|
+   * | arg[argc - 1] |
+   * |---------------|
+   * | 0             |
+   * |---------------|
+   * | env[0]        |
+   * |---------------|
+   * :               :
+   * :               :
+   * |---------------|
+   * | env[n]        |
+   * |---------------|
+   * | 0             |
+   * |---------------| <-- Beginning of data returned by sysctl() is here.
+   * | argc          |
+   * |---------------|
+   * | exec_path     |
+   * |:::::::::::::::|
+   * |               |
+   * | String area.  |
+   * |               |
+   * |---------------| <-- Top of stack.
+   * :               :
+   * :               :
+   * \---------------/ 0xffffffff
+   */
+  mib[0] = CTL_KERN;
+  mib[1] = KERN_PROCARGS2;
+  mib[2] = pid;
+
+
+  size = (size_t)argmax;
+  if (sysctl(mib, 3, procargs, &size, NULL, 0) == -1) {
+    goto ERROR_B;
+  }
+
+  memcpy(&nargs, procargs, sizeof(nargs));
+  cp = procargs + sizeof(nargs);
+
+  /* Skip the saved exec_path. */
+  for (; cp < &procargs[size]; cp++) {
+    if (*cp == '\0') {
+      /* End of exec_path reached. */
+      break;
+    }
+  }
+  if (cp == &procargs[size]) {
+    goto ERROR_B;
+  }
+
+  /* Skip trailing '\0' characters. */
+  for (; cp < &procargs[size]; cp++) {
+    if (*cp != '\0') {
+      /* Beginning of first argument reached. */
+      break;
+    }
+  }
+  if (cp == &procargs[size]) {
+    goto ERROR_B;
+  }
+  /* Save where the argv[0] string starts. */
+  sp = cp;
+
+  /*
+   * Iterate through the '\0'-terminated strings and convert '\0' to ' '
+   * until a string is found that has a '=' character in it (or there are
+   * no more strings in procargs).  There is no way to deterministically
+   * know where the command arguments end and the environment strings
+   * start, which is why the '=' character is searched for as a heuristic.
+   */
+  for (np = NULL; c < nargs && cp < &procargs[size]; cp++) {
+    if (*cp == '\0') {
+      c++;
+      if (np != NULL) {
+          /* Convert previous '\0'. */
+          *np = ' ';
+      } else {
+          /* *argv0len = cp - sp; */
+      }
+      /* Note location of current '\0'. */
+      np = cp;
+
+      if (!show_args) {
+          /*
+           * Don't convert '\0' characters to ' '.
+           * However, we needed to know that the
+           * command name was terminated, which we
+           * now know.
+           */
+          break;
+      }
+    }
+  }
+
+  /*
+   * sp points to the beginning of the arguments/environment string, and
+   * np should point to the '\0' terminator for the string.
+   */
+  if (np == NULL || np == sp) {
+    /* Empty or unterminated string. */
+    goto ERROR_B;
+  }
+
+  /* Make a copy of the string. */
+  strcpy(cmdline, sp);
+
+  /* Clean up. */
+  free(procargs);
+  return 0;
+
+  ERROR_B:
+  free(procargs);
+  ERROR_A:
+  return -1;
+}
+
 /*
  * call-seq:
  *    ProcTable.ps(pid=nil)
@@ -102,6 +261,10 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
       } else {
          fprintf(stderr, "err: %s LEN: %d\n", strerror(errno), args_size);
       }*/
+      char cmdline[ARGS_MAX_LEN+1];
+
+      argv_of_pid(procs[i].kp_proc.p_pid, &cmdline);
+      /* free(cmdline); */
 
       // Get the start time of the process
       v_start_time = rb_time_new(
@@ -156,7 +319,7 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
          INT2FIX(procs[i].kp_proc.p_priority),
          INT2FIX(procs[i].kp_proc.p_usrpri),
          INT2FIX(procs[i].kp_proc.p_nice),
-         rb_str_new2(args),
+         rb_str_new2(cmdline),
          v_start_time,
          (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_maxrss) : Qnil,
          (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_ixrss) : Qnil,
@@ -253,3 +416,4 @@ void Init_proctable(){
       "utime","stime", NULL
    );
 }
+

data/lib/sys/top.rb

@@ -1,5 +1,4 @@
 require 'sys/proctable'
-require 'rbconfig'
 
 # The Sys module serves as a namespace only
 module Sys
@@ -19,10 +18,8 @@ module Sys
     def self.top(num=10, field='pctcpu')
       field = field.to_s if field.is_a?(Symbol)
 
-      windows = /mswin|win32|windows|dos|cygwin|mingw/i
-
       # Sort by pid on Windows by default
-      if Config::CONFIG['host_os'].match(windows) && field == 'pctcpu'
+      if File::ALT_SEPARATOR && field == 'pctcpu'
         field = 'pid'
       end
 

data/sys-proctable.gemspec

@@ -1,9 +1,8 @@
 require 'rubygems'
-require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '0.9.1'
+  spec.version    = '0.9.2'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0' 
   spec.email      = 'djberg96@gmail.com'
@@ -27,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'sysutils'
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/top.txt']
 
-  spec.add_development_dependency('test-unit', '>= 2.1.2')
+  spec.add_development_dependency('test-unit', '>= 2.4.0')
 
   spec.description = <<-EOF
     The sys-proctable library provides an interface for gathering information

data/test/test_sys_proctable_all.rb

@@ -9,13 +9,12 @@ gem 'test-unit'
 
 require 'test/unit'
 require 'sys/proctable'
-require 'rbconfig'
 require 'test/test_sys_top'
 include Sys
 
 class TC_ProcTable_All < Test::Unit::TestCase
   def self.startup
-    @@windows = Config::CONFIG['host_os'] =~ /windows|win32|msdos|mswin32|mingw|cygwin/i
+    @@windows = File::ALT_SEPARATOR
   end
 
   def setup
@@ -23,7 +22,7 @@ class TC_ProcTable_All < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('0.9.1', ProcTable::VERSION)
+    assert_equal('0.9.2', ProcTable::VERSION)
   end
 
   def test_fields

metadata

@@ -1,50 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sys-proctable
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+version: !ruby/object:Gem::Version
+  version: 0.9.2
+  prerelease: 
 platform: universal-darwin
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-20 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test-unit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :development
-  version_requirements: *id001
-description: "    The sys-proctable library provides an interface for gathering information\n    about processes on your system, i.e. the process table. Most major\n    platforms are supported and, while different platforms may return\n    different information, the external interface is identical across\n    platforms.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+description: ! "    The sys-proctable library provides an interface for gathering
+  information\n    about processes on your system, i.e. the process table. Most major\n
+  \   platforms are supported and, while different platforms may return\n    different
+  information, the external interface is identical across\n    platforms.\n"
 email: djberg96@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/darwin/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
 - doc/top.txt
 - ext/darwin/sys/proctable.c
-files: 
+files:
 - benchmarks/bench_ps.rb
 - examples/example_ps.rb
 - lib/sys/top.rb
@@ -58,38 +55,31 @@ files:
 - ext/darwin/sys/proctable.c
 - test/test_sys_proctable_darwin.rb
 - ext/darwin/extconf.rb
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/sysutils
-licenses: 
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sysutils
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An interface for providing process table information
-test_files: 
+test_files:
 - test/test_sys_proctable_all.rb
 - test/test_sys_proctable_darwin.rb