sys-proctable 0.8.1-x86-darwin-8 → 0.8.2-x86-darwin-8

data/CHANGES

@@ -1,3 +1,22 @@
+== 0.9.0 - 14-Oct-2009
+* Changed the license to Artistic 2.0.
+* Fixed a bug in the OS X code where a segfault would occur when an attempt
+  was made to gather resource usage information on zombie processes. From
+  now on that information is always set to nil for zombie processes. Thanks
+  go to Tom Lianza for the spot and Philip Kromer for investigating the
+  root cause of the failure.
+* Removed the FreeBSD code that read out of /proc. It was a pain from a
+  maintenance point of view, and most FreeBSD installs do not mount /proc
+  by default. The FreeBSD platform now uses the same code that the other
+  BSD platforms use.
+* Fixed a bug in the BSD code where the ProcTable::Error class had the
+  wrong parent class.
+* Some major gemspec updates, including an updated license. The platform
+  handling logic is now in the Rakefile in the 'gem' task.
+* Updated the README file to include an additional acknowledgement, a
+  license change and some minor formatting changes.
+* The test-unit library was changed from a runtime to a development dependency.
+
 == 0.8.1 - 6-Apr-2009
 * The Linux and Solaris libraries now handle the possibility of a process
   terminating in the middle of a read more gracefully. If that happens, they

data/MANIFEST

@@ -1,38 +1,30 @@
-CHANGES
-INSTALL
-MANIFEST
-Rakefile
-sys-proctable.gemspec
-
-doc/freebsd.txt
-doc/hpux.txt
-doc/linux.txt
-doc/solaris.txt
-doc/top.txt
-doc/windows.txt
-
-example/example_ps.rb
-
-ext/extconf.rb
-ext/bsd/bsd.c
-ext/darwin/darwin.c
-ext/freebsd/freebsd.c
-ext/freebsd/freebsd.h
-ext/hpux/hpux.c
-ext/hpux/hpux.h
-ext/version.h
-
-lib/sys/top.rb
-lib/sys/linux.rb
-lib/sys/sunos.rb
-lib/sys/windows.rb
-
-test/test_sys_proctable_all.rb
-test/test_sys_proctable_darwin.rb
-test/test_sys_proctable_freebsd.rb
-test/test_sys_proctable_hpux.rb
-test/test_sys_proctable_kvm.rb
-test/test_sys_proctable_linux.rb
-test/test_sys_proctable_sunos.rb
-test/test_sys_proctable_windows.rb
-test/test_sys_top.rb
+* CHANGES
+* MANIFEST
+* Rakefile
+* README
+* sys-proctable.gemspec
+* doc/bsd.txt
+* doc/hpux.txt
+* doc/linux.txt
+* doc/solaris.txt
+* doc/top.txt
+* doc/windows.txt
+* example/example_ps.rb
+* ext/bsd/extconf.rb
+* ext/bsd/sys/proctable.c
+* ext/darwin/extconf.rb
+* ext/darwin/sys/proctable.c
+* ext/hpux/extconf.rb
+* ext/hpux/sys/proctable.c
+* lib/sys/top.rb
+* lib/linux/sys/proctable.rb
+* lib/sunos/sys/proctable.rb
+* lib/windows/sys/proctable.rb
+* test/test_sys_proctable_all.rb
+* test/test_sys_proctable_darwin.rb
+* test/test_sys_proctable_hpux.rb
+* test/test_sys_proctable_bsd.rb
+* test/test_sys_proctable_linux.rb
+* test/test_sys_proctable_sunos.rb
+* test/test_sys_proctable_windows.rb
+* test/test_sys_top.rb

data/README

@@ -1,21 +1,30 @@
-= Description
+== Description
    A Ruby interface for gathering process information.
 
-= Prerequisites
+== Prerequisites
 * Ruby 1.8.2 or later
-* Test::Unit 2.x
+* Test::Unit 2.x (development only)
 
-= Supported Platforms
+== Supported Platforms
 * Windows NT family (NT, 2000, XP, etc)
-* Linux
-* FreeBSD
-* Solaris 2.8+
-* HP-UX
-* OS X
+* Linux 2.6+
+* BSD (various flavors)
+* Solaris 8+
+* HP-UX 10+
+* OS X 10.4+
 
-= Installation
-* rake test (optional)
-* rake install
+== Installation
+=== Rubygems
+gem install sys-proctable
+
+You may need to specify a platform in some cases. For example:
+
+gem install sys-proctable --platform mswin32 # Windows
+gem install sys-proctable --platform sunos   # Solaris
+gem install sys-proctalbe --platform linux   # Linux
+
+=== Standard
+rake install
 
 = Synopsis
    require 'sys/proctable'
@@ -43,24 +52,14 @@
       ...
    end
 
-= Notes 
+== Notes 
    Windows users may pass a host name as a second argument to get process
    information from a different host. This relies on the WMI service running.
 
-   If you're building C source code, the ts_all.rb file is autogenerated for
-   you.
-
-= Known Issues
-=== FreeBSD
-   If you're building on FreeBSD, a standard /proc filesystem read approach is
-   used if mounted. Otherwise, a kvm interface is used. There are more fields
-   available with the kvm interface, but keep in mind that you need to be a
-   member of the kvm group (or root) to use this. You can tweak the extconf.rb
-   file manually if you want to force the issue.
-   
-=== OpenBSD, NetBSD
-   This library will attempt to use the kvm interface. It is untested,
-   however.
+== Known Issues
+=== BSD
+   A kvm interface is used. That means the owner of the process using the
+   sys-proctable library needs to be a member of the kvm group (or root).
 
 === Solaris
    The cmdline member on Solaris is limited to 80 characters unless you (or
@@ -75,27 +74,19 @@
    Proc::ProcessTable module. You can find that module on CPAN. Point your
    browser at http://search.cpan.org.
 
-=== Misc
-   If you build your library as a C extension (which is what will happen if
-   you run the 'build', 'test', or 'install' Rake tasks), then the .rb files
-   file under 'lib/sys/' are renamed to '.orig', except top.rb. This is
-   necessary to prevent mkmf from installing them during a 'make install'.
-
-   The 'clean' Rake task will rename them back to '.rb'.
-
 === Thread Safety
-   I am not currently using a thread-safe version of readdir().  I am not
-   especially concerned about it either.  If you are trying to read information
+   I am not currently using a thread-safe version of readdir(). I am not
+   especially concerned about it either. If you are trying to read information
    out of /proc from different threads at the same time there is something
    seriously wrong with your code logic. Using readdir_r() still won't solve
    all potential thread safety issues anyway.
 
-= Future Plans
+== Future Plans
    Research has indicated that the kvm approach is less favored than a sysctl
    approach on BSD variants. I will try to add this interface in a future
    release.
 
-= Acknowledgements
+== Acknowledgements
    This library is largely based on the Perl module Proc::ProcessTable by
    Dan Urist. Many ideas, as well as large chunks of code, were taken
    from his work. So, a big THANK YOU goes out to Dan Urist.
@@ -109,29 +100,27 @@
    Thanks go to James Hranicky for providing a patch that grabs name, eid,
    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.
 
    Finally I'd like to thank all the folks who have submitted bug reports
    and/or patches.
 
-= Help Wanted
-   I do not have access to all platforms. There are a few other major platforms
-   out there, namely AIX, OpenBSD, and IRIX, among others, that I would
-   like to see ports for. There are two ways you can help - either submit code
-   for your particular platform or give me an account on your platform so I can
-   develop on it.
+== Help Wanted
+   I do not have access to all platforms. If your platform is not supported
+   then you will need to either submit a patch or give me a remote account
+   on a box with a compiler so that I can write the code.
 
-= More documentation
+== More documentation
    See the documentation under the 'doc' directory for more information,
    including platform specific notes and issues.
 
-= License
-   Ruby's
+== License
+   Artistic 2.0
     
-= Copyright
+== Copyright
    (C) 2003-2009 Daniel J. Berger
    All Rights Reserved.
 
-= Author
+== Author
    Daniel J. Berger
-   djberg96 at nospam at gmail dot com
-   imperator on IRC (Freenode)

data/Rakefile

@@ -0,0 +1,167 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rbconfig'
+
+desc 'Clean the build files for C versions of sys-proctable'
+task :clean do
+   rm_rf('.test-result') if File.exists?('.test-result')
+   Dir['*.gem'].each{ |f| File.delete(f) }
+   
+   case Config::CONFIG['host_os']
+      when /bsd/i
+        dir = 'ext/bsd'
+      when /darwin/i
+        dir = 'ext/darwin'
+      when /hpux/i
+        dir = 'ext/hpux'
+   end
+
+   unless Config::CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|linux|sunos|solaris/i
+      Dir.chdir(dir) do
+         if Dir['*.o'].length > 0
+            sh 'make distclean'
+            Dir['sys/proctable.*'].each{ |f| rm(f) if File.extname(f) != '.c' }
+         end
+      end
+   end
+end
+
+desc 'Build the sys-proctable library for C versions of sys-proctable'
+task :build => [:clean] do
+   case Config::CONFIG['host_os']
+      when /bsd/i
+        dir = 'ext/bsd'
+      when /darwin/i
+        dir = 'ext/darwin'
+      when /hpux/i
+        dir = 'ext/hpux'
+   end
+
+   unless Config::CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|linux|sunos|solaris/i
+      Dir.chdir(dir) do
+         ruby 'extconf.rb'
+         sh 'make'
+         cp 'proctable.' + Config::CONFIG['DLEXT'], 'sys'
+      end
+   end
+end
+
+desc 'Install the sys-proctable library'
+task :install => [:build] do
+   file = nil
+   dir  = File.join(Config::CONFIG['sitelibdir'], 'sys')
+
+   Dir.mkdir(dir) unless File.exists?(dir)
+
+   case Config::CONFIG['host_os']
+      when /mswin|win32|msdos|cygwin|mingw/i
+         file = 'lib/windows/sys/proctable.rb'
+      when /linux/i
+         file = 'lib/linux/sys/proctable.rb'
+      when /sunos|solaris/i
+         file = 'lib/sunos/sys/proctable.rb'
+      when /bsd/i
+         Dir.chdir('ext/bsd'){ sh 'make install' }
+      when /darwin/i
+         Dir.chdir('ext/darwin'){ sh 'make install' }
+      when /hpux/i
+         Dir.chdir('ext/hpux'){ sh 'make install' }
+   end
+
+   cp(file, dir, :verbose => true) if file
+end
+
+desc 'Uninstall the sys-proctable library'
+task :uninstall do
+   case Config::CONFIG['host_os']
+      when /win32|mswin|dos|cygwin|mingw|linux|sunos|solaris/i
+         dir  = File.join(Config::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'])
+   end
+
+   rm(file) 
+end
+
+desc 'Run the benchmark suite'
+task :bench => [:build] do
+   sh "ruby -Ilib benchmarks/bench_ps.rb"
+end
+
+desc 'Run the example program'
+task :example => [:build] do
+   sh 'ruby -Ilib -Iext examples/example_ps.rb'
+end
+
+desc 'Run the test suite'
+Rake::TestTask.new do |t|
+   task :test => :build
+   t.libs << 'test'
+   
+   case Config::CONFIG['host_os']
+   when /mswin|msdos|cygwin|mingw/i
+      t.test_files = FileList['test/test_sys_proctable_windows.rb']
+      t.libs << 'lib/windows'
+   when /linux/i
+      t.test_files = FileList['test/test_sys_proctable_linux.rb']
+      t.libs << 'lib/linux'
+   when /sunos|solaris/i
+      t.test_files = FileList['test/test_sys_proctable_sunos.rb']
+      t.libs << 'lib/sunos'
+   when /darwin/i
+      t.libs << 'ext/darwin'
+      t.test_files = FileList['test/test_sys_proctable_darwin.rb']
+   when /bsd/i
+      t.libs << 'ext/bsd'
+      t.test_files = FileList['test/test_sys_proctable_bsd.rb']  
+   when /hpux/i
+      t.libs << 'ext/hpux'
+      t.test_files = FileList['test/test_sys_proctable_hpux.rb']  
+   end
+end
+
+desc 'Create a gem'
+task :gem do
+   spec = eval(IO.read('sys-proctable.gemspec'))
+
+   case Config::CONFIG['host_os']
+      when /bsd/i
+         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.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.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.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.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/i
+         spec.require_paths = ['lib', 'lib/windows']
+         spec.files += ['lib/windows/sys/proctable.rb']
+         spec.test_files << 'test/test_sys_proctable_windows.rb'
+   end
+
+   Gem::Builder.new(spec).build
+end
+
+desc 'Install the sys-proctable library as a gem'
+task :install_gem => [:gem] do
+   gem_name = Dir['*.gem'].first
+   sh "gem install #{gem_name}"
+end

data/benchmarks/bench_ps.rb

@@ -0,0 +1,21 @@
+########################################################################
+# bench_ps.rb
+#
+# Benchmark program to show overall speed and compare the block form
+# versus the non-block form. You should run this benchmark via the
+# 'rake bench' Rake task.
+########################################################################
+require 'benchmark'
+require 'sys/proctable'
+
+MAX = 10
+
+Benchmark.bm do |bench|
+   bench.report("Block form"){
+      MAX.times{ Sys::ProcTable.ps{} }
+   }
+
+   bench.report("Non-block form"){
+      MAX.times{ Sys::ProcTable.ps }
+   }
+end

data/doc/top.txt

@@ -7,9 +7,8 @@
 
 = Synopsis
    require "sys/top"
-   include Sys
 
-   Top.top(5).each{ |ps|
+   Sys::Top.top(5).each{ |ps|
       p ps
    }
 	
@@ -18,7 +17,7 @@ VERSION
    Returns the version number of this package as a String.
 	
 = Class Methods
-Top.top(number=10, field="pctcpu")
+Sys::Top.top(number=10, field="pctcpu")
    Returns an array of ProcTableStruct's.  The size of the array (i.e. the
    number of processes) that it returns is based on +number+, and sorted by
    +pctcpu+.  By default, the size and field values are 10 and "pctcpu",
@@ -33,7 +32,7 @@ Top.top(number=10, field="pctcpu")
    http://www.rubyforge.org/projects/sysutils
 	
 = License
-   Ruby's
+   Artistic 2.0
 	
 = Copyright
    (C) 2004-2009 Daniel J. Berger
@@ -45,6 +44,4 @@ Top.top(number=10, field="pctcpu")
    warranties of merchantability and fitness for a particular purpose.
 
 = Author
-   Daniel J. Berger
-   djberg96 at nospam at gmail dot com
-   imperator on IRC (Freenode)
+   Daniel J. Berger

data/examples/example_ps.rb

@@ -0,0 +1,20 @@
+#######################################################################
+# example_ps.rb
+#
+# Generic test program that demonstrates the use of ProcTable.ps. You
+# can run this via the 'rake example' task.
+#
+# Modify as you see fit
+#######################################################################
+require 'sys/proctable'
+include Sys
+
+puts "VERSION: " + ProcTable::VERSION
+sleep 2
+
+ProcTable.ps{ |s|
+   ProcTable.fields.each{ |field|
+      puts "#{field}: " + s.send(field).to_s    
+   }
+   puts '=' * 30
+}

data/ext/darwin/extconf.rb

@@ -0,0 +1,4 @@
+require 'mkmf'
+
+have_type('rb_pid_t', 'ruby.h')
+create_makefile('sys/proctable', 'sys')

data/ext/darwin/{darwin.c → sys/proctable.c}

@@ -1,10 +1,11 @@
-/* Mac OS X code for Ruby Sys::ProcTable                          */
-/* Date: 3-Mar-2006 (original submission date)                    */
-/* Author: David Felstead (david.felstead at gmail dot com)       */
-/* Based on bsd.c by Daniel J. Berger (djberg96 at gmail dot com) */
-
+/**********************************************************************
+ * Mac OS X code for sys-proctable Ruby library.                      *
+ *                                                                    *
+ * Date: 3-Mar-2006 (original submission date)                        *
+ * Author: David Felstead (david.felstead at gmail dot com)           *
+ * Based on bsd.c by Daniel J. Berger (djberg96 at gmail dot com)     *
+ *********************************************************************/
 #include "ruby.h"
-#include "version.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
@@ -12,6 +13,8 @@
 #include <sys/user.h>
 #include <errno.h>
 
+#define SYS_PROCTABLE_VERSION "0.9.0"
+
 #define PROC_MIB_LEN 4
 #define ARGS_MIB_LEN 3
 #define ARGS_MAX_LEN 4096
@@ -48,41 +51,40 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
    VALUE v_array = rb_ary_new();
    size_t length;
    char args[ARGS_MAX_LEN+1];
-   /* Passed into sysctl call */
+
+   // Passed into sysctl call
    static const int name_mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0};
 
    rb_scan_args(argc, argv, "01", &v_pid);
 
-   /* Get size of proc kproc buffer */
+   // Get size of proc kproc buffer
    err = sysctl( (int *) name_mib, PROC_MIB_LEN, NULL, &length, NULL, 0);
 
-   /* TODO: Get error message from errno */
    if(err == -1)
       rb_raise(cProcTableError, strerror(errno));
 
-   /* Populate the kproc buffer */
+   // Populate the kproc buffer
    procs = malloc(length);
 
-   if(procs == NULL) rb_raise(cProcTableError, strerror(errno));
+   if(procs == NULL)
+      rb_raise(cProcTableError, strerror(errno));
 
    err = sysctl( (int *) name_mib, PROC_MIB_LEN, procs, &length, NULL, 0);
 
-   /* TODO: Get error message from errno */
    if(err == -1)
       rb_raise(cProcTableError, strerror(errno));
 
-   /* If we're here, we got our list */
+   // If we're here, we got our list
    count = length / sizeof(struct kinfo_proc);
 
-   for(i=0; i<count; i++) {
-
-      /* Reset some variables */
+   for(i = 0; i < count; i++) {
       v_tty_num = Qnil;
       v_tty_dev = Qnil;
       v_start_time = Qnil;
 
-      /* If a PID is provided, skip unless the PID matches */
-      if( (!NIL_P(v_pid)) && (procs[i].kp_proc.p_pid != NUM2INT(v_pid))) continue;
+      // If a PID is provided, skip unless the PID matches
+      if( (!NIL_P(v_pid)) && (procs[i].kp_proc.p_pid != NUM2INT(v_pid)) )
+         continue;
 
       *args = '\0';
 
@@ -102,13 +104,13 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
          fprintf(stderr, "err: %s LEN: %d\n", strerror(errno), args_size);
       }*/
 
-      /* Get the start time of the process */
+      // Get the start time of the process
       v_start_time = rb_time_new(
          procs[i].kp_proc.p_un.__p_starttime.tv_sec,
          procs[i].kp_proc.p_un.__p_starttime.tv_usec
       );
 
-      /* Get the state of the process */
+      // Get the state of the process
       switch(procs[i].kp_proc.p_stat)
       {
          case SIDL:
@@ -131,7 +133,7 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
             break;
       }
 
-      /* Get ttynum and ttydev.  If ttynum is -1, there is no tty */
+      // Get ttynum and ttydev. If ttynum is -1, there is no tty.
       if(procs[i].kp_eproc.e_tdev != -1){
          v_tty_num = INT2FIX(procs[i].kp_eproc.e_tdev),
          v_tty_dev = rb_str_new2(devname(procs[i].kp_eproc.e_tdev, S_IFCHR));
@@ -147,7 +149,7 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
          rb_str_new2(procs[i].kp_proc.p_comm),
          rb_str_new2(state),
          rb_float_new(procs[i].kp_proc.p_pctcpu),
-         Qnil, //INT2FIX(procs[i].kp_proc.p_oncpu),
+         Qnil,
          v_tty_num,
          v_tty_dev,
          rb_str_new2(procs[i].kp_eproc.e_wmesg),
@@ -157,23 +159,22 @@ static VALUE pt_ps(int argc, VALUE* argv, VALUE klass){
          INT2FIX(procs[i].kp_proc.p_nice),
          rb_str_new2(args),
          v_start_time,
-         /* For some processes, p_ru is NULL */
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_maxrss)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_ixrss)         : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_idrss)         : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_isrss)         : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_minflt)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_majflt)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nswap)         : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_inblock)       : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_oublock)       : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_msgsnd)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_msgrcv)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nsignals)      : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nvcsw)         : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nivcsw)        : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_utime.tv_sec)  : Qnil,
-         procs[i].kp_proc.p_ru ? LONG2NUM(procs[i].kp_proc.p_ru->ru_stime.tv_sec)  : Qnil
+         (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,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_idrss) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_isrss) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_minflt) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_majflt) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nswap) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_inblock) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_oublock) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_msgsnd) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_msgrcv) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nsignals) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nvcsw) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_nivcsw) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_utime.tv_sec) : Qnil,
+         (procs[i].kp_proc.p_ru && procs[i].kp_proc.p_stat != 5) ? LONG2NUM(procs[i].kp_proc.p_ru->ru_stime.tv_sec) : Qnil
       );
 
       OBJ_FREEZE(v_pstruct); // This is read-only data
@@ -240,10 +241,10 @@ void Init_proctable(){
 
    /* Constants */
 
-   /* 0.8.0: The version of this library */
+   /* 0.9.0: The version of the sys-proctable library */
    rb_define_const(cProcTable, "VERSION", rb_str_new2(SYS_PROCTABLE_VERSION));
 
-   /* Structures */
+   /* Structs */
 
    sProcStruct = rb_struct_define("ProcTableStruct","pid","ppid","pgid","ruid",
       "rgid","comm","state","pctcpu","oncpu","tnum","tdev","wmesg",

data/lib/sys/top.rb

@@ -18,9 +18,11 @@ module Sys
       # 
       def self.top(num=10, field='pctcpu')
          field = field.to_s if field.is_a?(Symbol)
+         
+         windows = /mswin|win32|dos|cygwin|mingw/i
 
          # Sort by pid on Windows by default
-         if Config::CONFIG['host_os'].match('mswin') && field == 'pctcpu'
+         if Config::CONFIG['host_os'].match(windows) && field == 'pctcpu'
             field = 'pid'
          end
          

data/sys-proctable.gemspec

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'rbconfig'
+
+Gem::Specification.new do |gem|
+   gem.name       = 'sys-proctable'
+   gem.version    = '0.8.2'
+   gem.author     = 'Daniel J. Berger'
+   gem.license    = 'Artistic 2.0' 
+   gem.email      = 'djberg96@gmail.com'
+   gem.homepage   = 'http://www.rubyforge.org/projects/sysutils'
+   gem.platform   = Gem::Platform::CURRENT
+   gem.summary    = 'An interface for providing process table information'
+   gem.has_rdoc   = true
+   gem.test_files = ['test/test_sys_proctable_all.rb']
+   
+   # Additional files for your platform are added by the 'rake gem' task.
+   gem.files = [
+      'benchmarks/bench_ps.rb',
+      'examples/example_ps.rb',
+      'lib/sys/top.rb',
+      'CHANGES',
+      'MANIFEST',
+      'Rakefile',
+      'README',
+      'sys-proctable.gemspec'
+   ]
+
+   gem.rubyforge_project = 'sysutils'
+   gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/top.txt']
+
+   gem.add_development_dependency('test-unit', '>= 2.0.3')
+
+   gem.description = <<-EOF
+      The sys-proctable library provides an interface for gathering information
+      about processes on your system, i.e. the process table. Most major
+      platforms are supported and, while different platforms may return
+      different information, the external interface is identical across
+      platforms.
+   EOF
+end

data/test/test_sys_proctable_all.rb

@@ -23,7 +23,7 @@ class TC_ProcTable_All < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.8.1', ProcTable::VERSION)
+      assert_equal('0.9.0', ProcTable::VERSION)
    end
 
    def test_fields
@@ -69,6 +69,11 @@ class TC_ProcTable_All < Test::Unit::TestCase
    def test_new_not_allowed
       assert_raise(NoMethodError){ Sys::ProcTable.new }
    end
+
+   def test_error_class_defined
+      assert_not_nil(Sys::ProcTable::Error)
+      assert_kind_of(StandardError, Sys::ProcTable::Error.new)
+   end
    
    def teardown
       @pid  = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sys-proctable
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: x86-darwin-8
 authors: 
 - Daniel J. Berger
@@ -9,46 +9,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -06:00
+date: 2009-10-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.3
     version: 
-description: An interface for providing process table information
+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: 
-- ext/extconf.rb
+- ext/darwin/extconf.rb
 extra_rdoc_files: 
 - CHANGES
 - README
 - MANIFEST
 - doc/top.txt
-- ext/darwin/darwin.c
+- ext/darwin/sys/proctable.c
 files: 
+- benchmarks/bench_ps.rb
+- examples/example_ps.rb
 - lib/sys/top.rb
-- test/test_sys_proctable_all.rb
-- test/test_sys_proctable_darwin.rb
 - CHANGES
-- README
 - MANIFEST
+- Rakefile
+- README
+- sys-proctable.gemspec
 - doc/top.txt
-- ext/darwin/darwin.c
-- ext/extconf.rb
-- ext/version.h
+- ext/darwin/sys/proctable.c
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/sysutils
-licenses: []
-
+licenses: 
+- Artistic 2.0
 post_install_message: 
 rdoc_options: []
 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.3.1.2403
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An interface for providing process table information

data/ext/extconf.rb

@@ -1,78 +0,0 @@
-#############################################################################
-# Installation script for sys-proctable.
-#
-# By running this file, it is assumed that you want a C extension, and not
-# a pure Ruby version.  If you want a pure Ruby version (and you're on a 
-# platform for which it's supported), run install.rb instead.
-#############################################################################
-require 'mkmf'
-require 'fileutils'
-require 'rbconfig'
-
-c_file  = nil
-h_file  = nil
-
-########################################################################
-# Ruby 1.8.3 and later mandates the use of rb_pid_t over pid_t because
-# some libraries define their own pid_t.  So, we check for that.
-########################################################################
-have_type('rb_pid_t', 'ruby.h')
-
-##########################################################################
-# Determine appropriate source files based on platform.  Also, check for
-# certain header files and/or libraries on some platforms.
-#
-# FreeBSD has its own source file if /proc is mounted and contains data.
-# Otherwise it uses the kvm interface. All other BSD platforms always use
-# the kvm interface.
-##########################################################################
-case Config::CONFIG['host_os']
-   when /hpux/i
-      c_file = 'hpux/hpux.c'
-      h_file = 'hpux/hpux.h'
-   when /bsd/i
-      if Config::CONFIG['host_os'].match('freebsd') && Dir['/proc/*'].length > 0
-         c_file = 'freebsd/freebsd.c'
-         h_file = 'freebsd/freebsd.h'
-      else
-         have_library('kvm')
-         have_func('kvm_openfiles')
-         have_struct_member('struct kinfo_proc', 'kp_proc', 'sys/user.h')
-         have_struct_member('struct kinfo_proc', 'kp_eproc', 'sys/user.h')
-         have_struct_member('struct kinfo_proc', 'u_kproc', 'sys/user.h')
-         have_struct_member('struct eproc', 'e_stats', 'sys/sysctl.h')
-         have_struct_member('struct eproc', 'p_oncpu', 'sys/sysctl.h')
-         have_struct_member('struct eproc', 'p_runtime', 'sys/sysctl.h')          
-         c_file  = 'bsd/bsd.c'
-      end
-   when /darwin/i
-      c_file = 'darwin/darwin.c'
-   when /windows|mswin|cygwin|mingw|dos|linux|sunos|solaris/i
-      STDERR.puts "Use the 'rake install' task to install pure Ruby versions"
-      exit
-   else
-      STDERR.puts 'This platform not currently supported.  Exiting...'
-      exit
-end
-
-#####################################################################
-# Move the '.rb' files under 'lib/sys/' to '.orig' to prevent
-# mkmf from installing them during the 'make install' phase.
-#####################################################################
-Dir.chdir("../lib/sys"){
-   Dir["*.rb"].each{ |file|
-      next if file == 'top.rb'
-      File.rename(file, File.basename(file, '.rb') + '.orig')
-   }
-}
-
-########################################################################
-# Copy or link files to current directory for create_makefile to work.
-######################################################################## 
-File.delete('proctable.c') rescue nil
-File.delete(File.basename(h_file)) rescue nil
-
-FileUtils.cp(c_file, 'proctable.c')
-FileUtils.cp(h_file, File.basename(h_file)) if h_file
-
-create_makefile('sys/proctable')

data/ext/version.h

@@ -1,2 +0,0 @@
-/* version.h - stores the version number for all platforms (that use C) */
-#define SYS_PROCTABLE_VERSION "0.8.1"