sys-proctable 0.7.3 → 0.7.4

data/ext/sunos/sunos.h

@@ -0,0 +1,177 @@
+/*****************************************************************************
+ * solaris.h
+ *
+ * Solaris specific header file.  Some things copy/pasted straight out
+ * of Dan Urist's Proc::ProcessTable Perl module.
+ *****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/proc.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <utmpx.h>
+
+/* This bit of magic was taken from a post by Stefan Teleman on the KDE
+ * mailing list.  It allows us to build without having to disable largefile
+ * support or explicitly build a 64 bit Ruby.
+ */
+#if (!defined(_LP64)) && (_FILE_OFFSET_BITS - 0 == 64)
+#define PROCFS_FILE_OFFSET_BITS_HACK 1
+#undef _FILE_OFFSET_BITS
+#else
+#define PROCFS_FILE_OFFSET_BITS_HACK 0
+#endif
+
+#if defined(HAVE_PROCFS_H)
+#include <procfs.h>
+#else
+#include <sys/procfs.h>
+#endif
+
+#if (PROCFS_FILE_OFFSET_BITS_HACK - 0 == 1)
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#ifndef CLK_TCK
+#define CLK_TCK sysconf(_SC_CLK_TCK)
+#endif
+
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
+/* Ruby 1.8.3 or later */
+#ifdef HAVE_TYPE_RB_PID_T
+#define pid_t rb_pid_t
+#endif
+
+#define COMM_MAX 64
+#define STATE_MAX 20
+#define WCHAN_MAX 64
+
+/* Function prototypes */
+static void getprusage(pid_t pid, prusage_t* pr_usage);
+
+/* Process state strings that we return */
+#define SLEEP  "sleep"
+#define WAIT   "wait"       
+#define RUN    "run"
+#define IDLE   "idle"
+#define ZOMBIE "zombie"
+#define STOP   "stop"
+#define ONPROC "onprocessor"
+
+/*
+ * A simple static structure, mainly for use with the 'fields()' class method.
+ * The fields here *should* be identical to the fields listed in the ps_struct.
+ * The exception is the 'comm' field, which I added to give it a bit of
+ * (foolish?) consistency with the other platforms.  I will try to make sure
+ * that field is common to all platforms.
+ */
+static char* fields[] = {
+   "flag",
+#ifdef HAVE_PROCFS_H
+   "nlwp",
+#endif
+   "pid",
+   "ppid",
+   "pgid",
+   "sid",
+   "uid",
+   "euid",
+   "gid",
+   "egid",
+   "priority",
+   "nice",
+   "ttydev",
+   "time",
+   "ctime",
+   "size",
+   "rss",
+   "wchan",
+   "pctcpu",
+   "pctmem",
+   "state",
+   "fname",
+   "cmdline",
+   "start",
+#ifdef HAVE_PROCFS_H
+   "processor",
+#endif
+   "comm",
+   "num_args",
+   "cmd_args",
+   "lwpid",
+   "count",
+   "tstamp",
+   "create",
+   "term",
+   "rtime",
+   "utime",
+   "stime",
+   "ttime",
+   "tftime",
+   "dftime",
+   "kftime",
+   "ltime",
+   "slptime",
+   "wtime",
+   "stoptime",
+   "minf",
+   "majf",
+   "nswap",
+   "inblk",
+   "oublk",
+   "msnd",
+   "mrcv",
+   "sigs",
+   "vctx",
+   "ictx",
+   "sysc",
+   "ioch"
+};
+
+/*
+ * Private function for getting data out of the /proc/self/usage directory.
+ * Based on Rich Teer's function in "Solaris Systems Programming", p.329
+ * and p.332. 
+ */
+#if defined(HAVE_PROCFS_H)
+static void getprusage(pid_t pid, prusage_t* pr_usage){
+   int fd;
+   char name[PATH_MAX];
+
+   snprintf(name, PATH_MAX, "/proc/%ld/usage", (long)pid);
+
+   if((fd = open(name, O_RDONLY)) == -1)
+      rb_sys_fail(0);
+
+   if(read(fd,pr_usage,sizeof(prusage_t)) == -1){
+      close(fd);
+      rb_sys_fail(0);
+   }
+
+   close(fd);
+}
+#else
+static void getprusage(pid_t pid, prusage_t* pr_usage){
+   int fd;
+   char name[PATH_MAX];
+
+   snprintf(name, PATH_MAX, "/proc/%ld", (long)pid);
+
+   if((fd = open(name, O_RDONLY)) == -1)
+      rb_sys_fail(0);
+
+   if(ioctl(fd,PIOCUSAGE,pr_usage) == -1){
+      close(fd);
+      rb_sys_fail(0);
+   }
+
+   close(fd);
+}
+#endif

data/{lib → ext}/version.h

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

data/lib/sys/top.rb

@@ -0,0 +1,23 @@
+require "sys/proctable"
+module Sys
+   class Top
+      VERSION = "1.0.1"
+      WINDOWS = PLATFORM.match("mswin")
+
+      def self.top(num=10, field="pctcpu")
+         # Sort by pid on Windows by default
+         if WINDOWS && field == "pctcpu"
+            field = "pid"
+         end
+         
+         # Linux does not have a pctcpu field yet
+         if RUBY_PLATFORM =~ /linux/ && field == "pctcpu"
+            field = "pid"
+         end
+            
+         Sys::ProcTable.ps.sort{ |a,b|
+            b.send(field) <=> a.send(field)
+         }[0..num-1]
+      end
+   end
+end

data/test/tc_all.rb

@@ -5,35 +5,31 @@
 ##################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   $LOAD_PATH.unshift Dir.pwd
-end
-
-if File::ALT_SEPARATOR
-   File.copy("lib/os/windows.rb","sys/proctable.rb")
-else
-   extension = ".so"
-   extension = ".bundle" if RUBY_PLATFORM =~ /powerpc|darwin/i
-   extension = ".sl" if RUBY_PLATFORM =~ /hpux/i
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   Dir.chdir '..' if base == 'test'
 
-   pt_file = "proctable" + extension
-
-   if File.exist?(pt_file)
-      File.copy(pt_file, "sys")
+   if RUBY_PLATFORM.match('mswin')
+      File.rename('lib/sys/windows.rb', 'lib/sys/proctable.rb')
+   else
+      require 'rbconfig'
+      file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+      Dir.mkdir('sys') unless File.exists?('sys')
+      FileUtils.cp(file, 'sys')
    end
+
+   $LOAD_PATH.unshift(Dir.pwd)
+   $LOAD_PATH.unshift(Dir.pwd + '/lib')
 end
 
-require "sys/proctable"
-require "test/unit"
+require 'sys/proctable'
+require 'test/unit'
 include Sys
 
 class TC_ProcTable_All < Test::Unit::TestCase
 
    def test_version
-      assert_equal('0.8.0', ProcTable::VERSION, "Bad VERSION constant")
+      assert_equal('0.7.4', ProcTable::VERSION)
    end
 
    def test_fields
@@ -52,7 +48,7 @@ class TC_ProcTable_All < Test::Unit::TestCase
    def test_ps_with_args
       assert_nothing_raised{ ProcTable.ps(0) }
       assert_nothing_raised{ ProcTable.ps(nil) }
-      assert_raises(TypeError){ ProcTable.ps("vim") }
+      assert_raises(TypeError){ ProcTable.ps('vim') }
       assert_raises(ArgumentError){ ProcTable.ps(0,1) }
    end
 

data/test/tc_freebsd.rb

@@ -5,11 +5,15 @@
 ############################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("proctable.so","sys") if File.exists?("proctable.so")
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   require 'rbconfig'
+
+   Dir.chdir '..' if base == 'test'
+   file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp(file, 'sys')
+
    $LOAD_PATH.unshift(Dir.pwd)
 end
 

data/test/tc_hpux.rb

@@ -1,16 +1,19 @@
 ##################################################
 # tc_hpux.rb
 #
-# Test suite for sys-proctable for HP-UX
-# Requires testunit 0.1.6 or later.
+# Test case for sys-proctable for HP-UX.
 ##################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("proctable.sl","sys") if File.exists?("proctable.sl")
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   require 'rbconfig'
+
+   Dir.chdir('..') if base == 'test'
+   file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp(file, 'sys')
+
    $LOAD_PATH.unshift(Dir.pwd)
 end
 

data/test/tc_kvm_bsd.rb

@@ -4,11 +4,16 @@
 # Test suite for the BSD specific version of the kvm interface. 
 ################################################################
 base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("proctable.so","sys") if File.exists?("proctable.so")
+
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   require 'rbconfig'
+
+   Dir.chdir '..' if base == 'test'
+   file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp(file, 'sys')
+
    $LOAD_PATH.unshift(Dir.pwd)
 end
 

data/test/tc_linux.rb

@@ -5,12 +5,15 @@
 ##########################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.delete("sys/proctable.so") rescue nil
-   File.copy("proctable.so","sys") if File.exists?("proctable.so")
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   require 'rbconfig'
+
+   Dir.chdir '..' if base == 'test'
+   file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp(file, 'sys')
+
    $LOAD_PATH.unshift(Dir.pwd)
 end
 

data/test/tc_sunos.rb

@@ -5,11 +5,15 @@
 ##################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("proctable.so","sys") if File.exists?("proctable.so")
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   require 'rbconfig'
+
+   Dir.chdir '..' if base == 'test'
+   file = 'ext/proctable.' + Config::CONFIG['DLEXT']
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp(file, 'sys')
+
    $LOAD_PATH.unshift(Dir.pwd)
 end
 

data/test/tc_top.rb

@@ -5,33 +5,32 @@
 ##############################################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("lib/top.rb","sys")
+if base == 'test' || base =~ /sys-proctable.*/
+   require 'fileutils'
+   Dir.chdir('..') if base == 'test'
+   Dir.mkdir('sys') unless File.exists?('sys')
+   FileUtils.cp('lib/top.rb', 'sys')
    $LOAD_PATH.unshift Dir.pwd
-   $LOAD_PATH.unshift Dir.pwd + "/lib"
 end
 
-require "sys/top"
-require "test/unit"
+require 'sys/top'
+require 'test/unit'
 include Sys
 
 class TC_Top < Test::Unit::TestCase
    def test_version
-      assert_equal("1.0.1", Top::VERSION)
+      assert_equal('1.0.1', Top::VERSION)
    end
 
    def test_top
       assert_respond_to(Top,:top)
       assert_nothing_raised{ Top.top }
       assert_nothing_raised{ Top.top(5) }
-      assert_nothing_raised{ Top.top(5,"cmdline") }
-      assert_raises(ArgumentError){ Top.top(1,"foo",2) }
-      assert_kind_of(Array,Top.top)
-      assert_equal(10,Top.top.length)
-      assert_equal(5,Top.top(5).length)
-      assert_kind_of(Struct::ProcTableStruct,Top.top.first)
+      assert_nothing_raised{ Top.top(5, 'cmdline') }
+      assert_raises(ArgumentError){ Top.top(1,'foo',2) }
+      assert_kind_of(Array, Top.top)
+      assert_equal(10, Top.top.length)
+      assert_equal(5, Top.top(5).length)
+      assert_kind_of(Struct::ProcTableStruct, Top.top.first)
    end
 end

data/test/tc_windows.rb

@@ -5,17 +5,15 @@
 ##################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-proctable.*/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("lib/os/windows.rb","sys/proctable.rb")
-   $LOAD_PATH.unshift Dir.pwd
+if base == 'test' || base =~ /sys-proctable.*/
+   Dir.chdir('..') if base == 'test'
+   File.rename("lib/sys/windows.rb", "lib/sys/proctable.rb")
+   $LOAD_PATH.unshift(Dir.pwd + '/lib')
 end
 
-require "sys/proctable"
-require "test/unit"
-require "test/tc_all"
+require 'sys/proctable'
+require 'test/unit'
+require 'test/tc_all'
 include Sys
 
 class TC_ProcTable_MSWindows < Test::Unit::TestCase