proc-wait3 1.5.2 → 1.5.3

data/CHANGES

@@ -1,3 +1,16 @@
+== 1.5.3 - 25-Oct-2006
+* Because not all platforms support automatically converting signal names
+  into their equivalent numbers, the Process.pause method now accepts names
+  or numbers.  It will raise an ArgumentError if you try to use a signal name
+  on a platform that doesn't support the str2sig() function (such as Linux).
+* Fixed a bug where fractional seconds for utime/stime were not reported in
+  the Process.getrusage method.  Thanks go to Eric Hodel for the spot and
+  the patch.
+* Fixed potential bigint overflow issues in the Process.getrusage method.
+  Thanks go again to Eric Hodel.
+* Internal fixes for platforms that don't support the strlcpy() function.
+* Minor update for the test_pause.rb example program.
+
 == 1.5.2 - 24-Jul-2006
 * Fixed the way I was handling whether or not Ruby already defined the various
   RLIMIT constants within wait3.c.

data/extconf.rb

@@ -34,11 +34,16 @@ unless have_func("wait3")
    exit
 end
 
-# wait4 and waitid are optional (HPUX, et al)
+# Yay, Linux
+have_func("str2sig")
+have_func("strlcpy")
+
+# wait4, waitid, etc, are optional (HPUX, et al)
 have_func("wait4")
 have_func("waitid")
 have_func("sigsend")
 have_func("getrusage")
+have_func("getdtablesize")
 
 have_struct_member("struct siginfo", "si_trapno", "signal.h")
 have_struct_member("struct siginfo", "si_pc", "signal.h")

data/lib/proc/wait3.c

@@ -384,35 +384,35 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
       );
    }
    else{
-      VALUE rbUtime = Qnil, rbStatus = Qnil, rbStime = Qnil, rbFD = Qnil;
+      VALUE v_utime = Qnil, v_status = Qnil, v_stime = Qnil, v_fd = Qnil;
 #ifdef HAVE_ST_SI_TRAPNO
-      VALUE rbTrapno = Qnil;
+      VALUE v_trapno = Qnil;
 #endif
 #ifdef HAVE_ST_SI_PC
-      VALUE rbPC = Qnil;
+      VALUE v_pc = Qnil;
 #endif
 #ifdef HAVE_ST_SI_FADDR
-      VALUE rbFaddr = Qnil;
+      VALUE v_addr = Qnil;
 #endif
 #ifdef HAVE_ST_SI_TSTAMP
-      VALUE rbTime = Qnil;
+      VALUE v_time = Qnil;
 #endif
 #ifdef HAVE_ST_SI_SYSCALL
-      VALUE rbSyscall = Qnil;
+      VALUE v_syscall = Qnil;
 #endif
 #ifdef HAVE_ST_SI_NSYSARG
-      VALUE rbNSysarg = Qnil;
+      VALUE v_nsysarg = Qnil;
 #endif
 #ifdef HAVE_ST_SI_FAULT
-      VALUE rbFault = Qnil;
+      VALUE v_fault = Qnil;
 #endif
 #ifdef HAVE_ST_SI_SYSARG
-      VALUE rbSysarg = Qnil;
+      VALUE v_sysarg = Qnil;
 #endif
 #ifdef HAVE_ST_SI_MSTATE
-      VALUE rbMState = Qnil;
+      VALUE v_state = Qnil;
 #endif
-      VALUE rbBand = Qnil, rbEntity = Qnil;
+      VALUE v_band = Qnil, v_entity = Qnil;
       int sig = infop.si_signo;
       int code = infop.si_code;
 
@@ -421,64 +421,64 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
        * the si_signo struct member will always be SIGCHLD.
        */
       if(sig == SIGCHLD){
-         rbUtime  = ULL2NUM(infop.si_utime);
-         rbStatus = ULL2NUM(infop.si_status);
-         rbStime  = ULL2NUM(infop.si_stime);
+         v_utime  = ULL2NUM(infop.si_utime);
+         v_status = ULL2NUM(infop.si_status);
+         v_stime  = ULL2NUM(infop.si_stime);
       }
 
       if(sig == SIGBUS || sig == SIGFPE || sig == SIGILL || sig == SIGSEGV ||
          sig == SIGTRAP)
       {
 #ifdef HAVE_ST_SI_TRAPNO
-         rbTrapno = INT2FIX(infop.si_trapno);
+         v_trapno = INT2FIX(infop.si_trapno);
 #endif
 #ifdef HAVE_ST_SI_PC
-         rbPC = INT2FIX(infop.si_pc);
+         v_pc = INT2FIX(infop.si_pc);
 #endif
       }
 
       if(sig == SIGXFSZ){
-         rbFD = INT2FIX(infop.si_fd);
+         v_fd = INT2FIX(infop.si_fd);
          if(code == POLL_IN || code == POLL_OUT || code == POLL_MSG){
-            rbBand = LONG2FIX(infop.si_band);
+            v_band = LONG2FIX(infop.si_band);
          }
       }
 
       if(sig == SIGPROF){
 #ifdef HAVE_ST_SI_SYSARG
          int ssize = sizeof(infop.si_sysarg) / sizeof(infop.si_sysarg[0]);
-         rbSysarg  = rb_ary_new();
+         v_sysarg  = rb_ary_new();
 
          for(i = 0; i < ssize; i++)
-            rb_ary_push(rbSysarg, LONG2FIX(infop.si_sysarg[i]));
+            rb_ary_push(v_sysarg, LONG2FIX(infop.si_sysarg[i]));
 #endif
 #ifdef HAVE_ST_SI_MSTATE
          int msize = sizeof(infop.si_mstate) / sizeof(infop.si_mstate[0]);
-         rbMState  = rb_ary_new();
+         v_state  = rb_ary_new();
 
          for(i = 0; i < msize; i++)
-            rb_ary_push(rbMState, INT2FIX(infop.si_mstate[i]));
+            rb_ary_push(v_state, INT2FIX(infop.si_mstate[i]));
 #endif
 #ifdef HAVE_ST_SI_FADDR
-         rbFaddr   = INT2FIX(infop.si_faddr);
+         v_addr   = INT2FIX(infop.si_faddr);
 #endif
 #ifdef HAVE_ST_SI_SYSCALL
-         rbSyscall = INT2FIX(infop.si_syscall);
+         v_syscall = INT2FIX(infop.si_syscall);
 #endif
 #ifdef HAVE_ST_SI_NSYSARG
-         rbNSysarg = INT2FIX(infop.si_nsysarg);
+         v_nsysarg = INT2FIX(infop.si_nsysarg);
 #endif
 #ifdef HAVE_ST_SI_FAULT
-         rbFault   = INT2FIX(infop.si_fault);
+         v_fault   = INT2FIX(infop.si_fault);
 #endif
 #ifdef HAVE_ST_SI_TSTAMP
-         rbTime = rb_time_new(infop.si_tstamp.tv_sec,infop.si_tstamp.tv_nsec);
+         v_time = rb_time_new(infop.si_tstamp.tv_sec,infop.si_tstamp.tv_nsec);
 #endif
       }
 
 #ifdef SIGXRES
       if(sig == SIGXRES){
-         rbEntity = INT2FIX(infop.si_entity);
+         v_entity = INT2FIX(infop.si_entity);
       }
 #endif
 
@@ -488,39 +488,39 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
          INT2FIX(infop.si_code),    /* Should be anything but SI_NOINFO     */
          INT2FIX(infop.si_pid),     /* Real PID that sent the signal        */
          INT2FIX(infop.si_uid),     /* Real UID of process that sent signal */
-         rbUtime,
-         rbStatus,
-         rbStime,
+         v_utime,
+         v_status,
+         v_stime,
 #ifdef HAVE_ST_SI_TRAPNO
-         rbTrapno,
+         v_trapno,
 #endif
 #ifdef HAVE_ST_SI_PC
-         rbPC,
+         v_pc,
 #endif
-         rbFD,
-         rbBand,
+         v_fd,
+         v_band,
 #ifdef HAVE_ST_SI_FADDR
-         rbFaddr,
+         v_addr,
 #endif
 #ifdef HAVE_ST_SI_TSTAMP
-         rbTime,
+         v_time,
 #endif
 #ifdef HAVE_ST_SI_SYSCALL
-         rbSyscall,
+         v_syscall,
 #endif
 #ifdef HAVE_ST_SI_NSYSARG
-         rbNSysarg,
+         v_nsysarg,
 #endif
 #ifdef HAVE_ST_SI_FAULT
-         rbFault,
+         v_fault,
 #endif
 #ifdef HAVE_ST_SI_SYSARG
-         rbSysarg,
+         v_sysarg,
 #endif
 #ifdef HAVE_ST_SI_MSTATE
-         rbMState,
+         v_state,
 #endif
-         rbEntity
+         v_entity
       );
    }
 
@@ -536,8 +536,14 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
  * you pass as arguments it will return from the pause and continue with
  * the execution of your code. Otherwise, it will exit.
  *
- * Note that you must leave out the 'SIG' prefix for the signal name, e.g.
- * use 'INT', not 'SIGINT'.
+ * The +signals+ argument can be an array of integers or strings (or a mix
+ * of each) which correspond to signals on your system. If a string is used,
+ * be sure to leave off the leading 'SIG' substring, e.g. use 'INT' instead
+ * of 'SIGINT'.
+ *
+ * Note that not all platforms (notably Linux) do not support automatically
+ * converting strings to their corresponding signal values, so it is
+ * recommended that you always use an array of numeric values.
  *
  * Returns the result of the pause() function, which should always be -1.
  */
@@ -558,11 +564,29 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
       for(i = 0; i < len; i++){
          v_val = rb_ary_shift(v_signals);
 
-         if(strlcpy(signame, StringValuePtr(v_val), max) >= max)
-            rb_raise(rb_eArgError, "string too large");
+         if(TYPE(v_val) == T_STRING){
+#ifdef HAVE_STRLCPY
+            if(strlcpy(signame, StringValuePtr(v_val), max) >= max)
+               rb_raise(rb_eArgError, "string too large");
+#else
+            if(RSTRING(v_val)->len > max)
+               rb_raise(rb_eArgError, "string too large");
+            else
+               strncpy(signame, RSTRING(v_val)->ptr, max);
+#endif
 
-         if(str2sig(signame, &signum) != 0)
-            rb_sys_fail("pause");
+#ifdef HAVE_STR2SIG
+            if(str2sig(signame, &signum) != 0)
+               rb_sys_fail("pause");
+#else
+            rb_raise(rb_eArgError,
+               "platform does not support signal names - use numbers instead"
+            );
+#endif
+         }
+         else{
+            signum = NUM2INT(v_val);
+         }
 
          sigset(signum, sigproc);
       }
@@ -688,29 +712,29 @@ static VALUE proc_getrusage(int argc, VALUE* argv, VALUE mod){
 
    rb_scan_args(argc, argv, "01", &v_children);
 
-   if(Qtrue == v_children)
+   if(RTEST(v_children))
       who = RUSAGE_CHILDREN;
 
    if(getrusage(who,&r) == -1)
       rb_sys_fail("getrusage");
 
    return rb_struct_new(v_usage_struct,
-      LONG2FIX(r.ru_utime.tv_sec),
-      LONG2FIX(r.ru_stime.tv_sec),
-      LONG2FIX(r.ru_maxrss),
-      LONG2FIX(r.ru_ixrss),
-      LONG2FIX(r.ru_idrss),
-      LONG2FIX(r.ru_isrss),
-      LONG2FIX(r.ru_minflt),
-      LONG2FIX(r.ru_majflt),
-      LONG2FIX(r.ru_nswap),
-      LONG2FIX(r.ru_inblock),
-      LONG2FIX(r.ru_oublock),
-      LONG2FIX(r.ru_msgsnd),
-      LONG2FIX(r.ru_msgrcv),
-      LONG2FIX(r.ru_nsignals),
-      LONG2FIX(r.ru_nvcsw),
-      LONG2FIX(r.ru_nivcsw)
+      rb_float_new((double)r.ru_utime.tv_sec+(double)r.ru_utime.tv_usec/1e6),
+      rb_float_new((double)r.ru_stime.tv_sec+(double)r.ru_stime.tv_usec/1e6),
+      LONG2NUM(r.ru_maxrss),
+      LONG2NUM(r.ru_ixrss),
+      LONG2NUM(r.ru_idrss),
+      LONG2NUM(r.ru_isrss),
+      LONG2NUM(r.ru_minflt),
+      LONG2NUM(r.ru_majflt),
+      LONG2NUM(r.ru_nswap),
+      LONG2NUM(r.ru_inblock),
+      LONG2NUM(r.ru_oublock),
+      LONG2NUM(r.ru_msgsnd),
+      LONG2NUM(r.ru_msgrcv),
+      LONG2NUM(r.ru_nsignals),
+      LONG2NUM(r.ru_nvcsw),
+      LONG2NUM(r.ru_nivcsw)
    );
 }
 #endif
@@ -775,6 +799,20 @@ static VALUE proc_setrlimit(int argc, VALUE* argv, VALUE mod){
 }
 #endif
 
+#ifdef HAVE_GETDTABLESIZE
+/*
+ * call-seq:
+ *    Process.getdtablesize
+ *
+ * Returns the current soft limit of the maximum file descriptor number.  This
+ * is effectively the same as calling Process.getrlimit with RLIMIT_NOFILE
+ * as the resource identifier.
+*/
+static VALUE proc_getdtablesize(VALUE mod){
+   return INT2FIX(getdtablesize());
+}
+#endif
+
 /*
  * Adds the wait3, wait4, waitid, pause, sigsend, and getrusage methods to the
  * Process module.
@@ -797,6 +835,10 @@ void Init_wait3()
    rb_define_module_function(rb_mProcess, "setrlimit", proc_setrlimit, -1);
 #endif
 
+#ifdef HAVE_GETDTABLESIZE
+   rb_define_module_function(rb_mProcess,"getdtablesize",proc_getdtablesize,0);
+#endif
+
 #ifdef HAVE_SIGSEND
    rb_define_module_function(rb_mProcess, "sigsend", proc_sigsend, -1);
 #endif
@@ -933,7 +975,7 @@ void Init_wait3()
 #endif
 #endif
 
-   rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.5.2"));
+   rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.5.3"));
 
    /* Define this last in our Init_wait3 function */
    rb_define_readonly_variable("$?", &v_last_status);

data/test/tc_wait3.rb

@@ -32,11 +32,11 @@ class TC_Wait3 < Test::Unit::TestCase
    end
 
    def test_wait3_version
-      assert_equal('1.5.2', Process::WAIT3_VERSION)
+      assert_equal('1.5.3', Process::WAIT3_VERSION)
    end
 
    def test_wait3_basic
-      assert_respond_to(Process,:wait3)
+      assert_respond_to(Process, :wait3)
    end
 
    def test_wait3_no_args
@@ -55,6 +55,14 @@ class TC_Wait3 < Test::Unit::TestCase
       assert_nothing_raised{ Process.wait3(Process::WNOHANG) }
    end
 
+   if RUBY_PLATFORM =~ /solaris|sunos/i
+      def test_getdtablesize
+         assert_respond_to(Process, :getdtablesize)
+         assert_kind_of(Fixnum, Process.getdtablesize)
+         assert(Process.getdtablesize > 0)
+      end
+   end
+
 unless RUBY_PLATFORM =~ /hpux/i
    def test_wait4_basic
       assert_respond_to(Process,:wait4)
@@ -131,6 +139,12 @@ end
       assert_nothing_raised{ Process.getrusage }
       assert_nothing_raised{ Process.getrusage(true) }
       assert_kind_of(Struct::RUsage, Process.getrusage)
+      assert_kind_of(Float, Process.getrusage.stime)
+      assert_kind_of(Float, Process.getrusage.utime)
+   end
+
+   def test_pause
+      assert_respond_to(Process, :pause)
    end
 
    def test_wait_constants

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: proc-wait3
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
-date: 2006-07-24 00:00:00 -06:00
+  version: 1.5.3
+date: 2006-10-25 00:00:00 -06:00
 summary: Adds the wait3, wait4, waitid, pause, sigsend, and getrusage methods to the Process module.  It also adds the getrlimit and setrlimit methods for Ruby 1.8.4 or earlier.
 require_paths: 
 - lib