sys-proctable 0.7.5 → 0.7.6

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/ext/version.h

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

data/test/tc_all.rb

@@ -1,35 +1,22 @@
-##################################################
+#######################################################################
 # tc_all.rb
 #
-# Test suite for methods common to all platforms.
-##################################################
-base = File.basename(Dir.pwd)
-
-if base == 'test' || base =~ /sys-proctable.*/
-   require 'fileutils'
-   Dir.chdir '..' if base == 'test'
-
-   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
-
+# Test suite for methods common to all platforms. Generally speaking
+# you should run this test case using the 'rake test' task.
+#######################################################################
+require 'socket'
 require 'test/unit'
 require 'sys/proctable'
 include Sys
 
 class TC_ProcTable_All < Test::Unit::TestCase
+   def setup
+      @host = Socket.gethostname
+      @pid  = RUBY_PLATFORM.match('mswin') ? 0 : 1
+   end
 
    def test_version
-      assert_equal('0.7.5', ProcTable::VERSION)
+      assert_equal('0.7.6', ProcTable::VERSION)
    end
 
    def test_fields
@@ -49,17 +36,24 @@ class TC_ProcTable_All < Test::Unit::TestCase
       assert_nothing_raised{ ProcTable.ps(0) }
       assert_nothing_raised{ ProcTable.ps(nil) }
       assert_raises(TypeError){ ProcTable.ps('vim') }
-      assert_raises(ArgumentError){ ProcTable.ps(0,1) }
+
+      if RUBY_PLATFORM.match('mswin')
+         assert_nothing_raised{ ProcTable.ps(0, @host) }
+         assert_raises(ArgumentError){ ProcTable.ps(0, @host, 1) }
+      else
+         assert_raises(ArgumentError){ ProcTable.ps(0, @host) }
+      end
    end
 
    def test_ps_return_values
       assert_kind_of(Array, ProcTable.ps)
-      assert_kind_of(Struct::ProcTableStruct, ProcTable.ps(1))
+      assert_kind_of(Struct::ProcTableStruct, ProcTable.ps(@pid))
       assert_equal(nil, ProcTable.ps(999999999))
       assert_equal(nil, ProcTable.ps{})
    end
-
-   alias :set_up :setup
-   alias :tear_down :teardown
-
+   
+   def teardown
+      @host = nil
+      @pid  = nil
+   end
 end

data/test/tc_freebsd.rb

@@ -3,27 +3,12 @@
 #
 # Test suite for sys-proctable for FreeBSD.
 ############################################
-base = File.basename(Dir.pwd)
-
-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
-
 require "sys/proctable"
 require "test/unit"
 require "test/tc_all"
 include Sys
 
 class TC_ProcTable_FreeBSD < Test::Unit::TestCase
-
    def setup
       @fields = %w/
          comm pid ppid pgid sid tdev_maj tdev_min flags start
@@ -57,8 +42,4 @@ class TC_ProcTable_FreeBSD < Test::Unit::TestCase
       @fields = nil
       @pt = nil
    end
-
-   alias :set_up :setup
-   alias :tear_down :teardown
-
 end

data/test/tc_hpux.rb

@@ -3,27 +3,12 @@
 #
 # Test case for sys-proctable for HP-UX.
 ##################################################
-base = File.basename(Dir.pwd)
-
-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
-
 require "sys/proctable"
 require "test/unit"
 require "test/tc_all"
 include Sys
 
 class TC_ProcTable_HPUX < Test::Unit::TestCase
-
    def setup
       @fields = %w/
          comm uid pid ppid dsize tsize ssize nice ttydev pgrp pri addr
@@ -61,7 +46,4 @@ class TC_ProcTable_HPUX < Test::Unit::TestCase
       @fields = nil
       @pt = nil
    end
-
-   alias :set_up :setup
-   alias :tear_down :teardown
 end

data/test/tc_kvm_bsd.rb

@@ -3,20 +3,6 @@
 #
 # Test suite for the BSD specific version of the kvm interface. 
 ################################################################
-base = File.basename(Dir.pwd)
-
-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
-
 require "test/unit"
 require "sys/proctable"
 include Sys

data/test/tc_linux.rb

@@ -3,20 +3,8 @@
 #
 # Test suite for sys-proctable for Linux.
 ##########################################
-base = File.basename(Dir.pwd)
-
-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
-
+require "sys/proctable"
+require "test/unit"
 require "test/tc_all"
 
 class TC_ProcTable_Linux < Test::Unit::TestCase
@@ -54,8 +42,4 @@ class TC_ProcTable_Linux < Test::Unit::TestCase
    def teardown
       @pt = nil
    end
-
-   alias :set_up :setup
-   alias :tear_down :teardown
-
 end

data/test/tc_sunos.rb

@@ -3,20 +3,6 @@
 #
 # Test suite for sys-proctable for SunOS/Solaris.
 ##################################################
-base = File.basename(Dir.pwd)
-
-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
-
 require "sys/proctable"
 require "test/unit"
 require "test/tc_all"
@@ -63,7 +49,4 @@ class TC_ProcTable_SunOS < Test::Unit::TestCase
       @pt = nil
       @fields = nil
    end
-
-   alias :set_up :setup
-   alias :tear_down :teardown
 end

data/test/tc_top.rb

@@ -3,14 +3,6 @@
 #
 # Test suite for the sys-top package that is included with this distribution.
 ##############################################################################
-base = File.basename(Dir.pwd)
-
-if base == 'test' || base =~ /sys-proctable.*/
-   Dir.chdir('..') if base == 'test'
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + '/lib')
-end
-
 require 'test/unit'
 require 'sys/top'
 include Sys

data/test/tc_windows.rb

@@ -3,18 +3,9 @@
 #
 # Test suite for sys-proctable for MS Windows
 ##################################################
-base = File.basename(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'
-include Sys
 
 class TC_ProcTable_MSWindows < Test::Unit::TestCase
    def setup