proc-wait3 1.5.6 → 1.6.0

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.6.0 - 28-Aug-2011
+* Removed the getrlimit and setrlimit methods. Ruby has supported these methods
+  since Ruby 1.8.5, so I think it's time to finally dump them.
+* Fixed two build warnings regarding unused variables and one 32/64 cast warning.
+
 == 1.5.6 - 7-Jan-2010
 * Checks are now made for the si_fd, si_utime, si_status and si_stime siginfo_t
   struct members. This addresses build failures on OS X 10.5 and later where

data/README

@@ -4,10 +4,21 @@
   and setrlimit methods.
 
 = Installation
-
   gem install proc-wait3
 
-== Tested Platforms
+= Synopsis
+  require 'proc/wait3'
+
+  pid = fork{
+    sleep 1
+    exit 2
+  }
+
+  puts Time.now.to_s
+  Process.wait3
+  puts $?.exitstatus # => 2
+
+= Tested Platforms
   * Solaris
   * Linux
   * FreeBSD

data/Rakefile

@@ -1,15 +1,19 @@
 require 'rake'
+require 'rake/clean'
 require 'rake/testtask'
 require 'fileutils'
+require 'rbconfig'
+include Config
 
-desc "Clean the generated build files"
-task :clean do |t|
-  Dir.chdir('ext') do
-    sh 'make distclean' rescue nil
-    rm 'proc/wait3.' + Config::CONFIG['DLEXT'] rescue nil
-    rm_rf 'conftest.dSYM' if File.exists?('conftest.dSYM') # OS X
-  end
-end
+CLEAN.include(
+  '**/*.gem',               # Gem files
+  '**/*.rbc',               # Rubinius
+  '**/*.o',                 # C object file
+  '**/*.log',               # Ruby extension build log
+  '**/Makefile',            # C Makefile
+  '**/conftest.dSYM',       # OS X build directory
+  "**/*.#{CONFIG['DLEXT']}" # C shared object
+)
 
 desc "Build the source (but don't install it)"
 task :build => [:clean] do |t|
@@ -20,15 +24,18 @@ task :build => [:clean] do |t|
   end
 end
 
-desc "Install the proc-wait3 library"
-task :install => [:build] do |t|
-  sh 'make install'
-end
+namespace :gem do
+  desc "Create the proc-wait3 gem"
+  task :create => [:clean] do
+    spec = eval(IO.read('proc-wait3.gemspec'))
+    Gem::Builder.new(spec).build
+  end
 
-desc "Build the gem"
-task :gem do
-  spec = eval(IO.read('proc-wait3.gemspec'))
-  Gem::Builder.new(spec).build
+  desc "Install the proc-wait3 gem"
+  task :install => [:create] do |t|
+    file = Dir['*.gem'].first
+    sh "gem install #{file}"
+  end
 end
 
 namespace :example do
@@ -64,3 +71,5 @@ Rake::TestTask.new do |t|
   t.warning = true
   t.verbose = true
 end
+
+task :default => :test

data/ext/extconf.rb

@@ -4,47 +4,29 @@
 ########################################################
 require 'mkmf'
 
+dir_config('proc-wait3')
+
 # We need this for older versions of Ruby.
 def have_const(const, header = nil, opt = "", &b)
-   checking_for const do
-      header = cpp_include(header)
-      if try_compile(<<"SRC", opt, &b)
+  checking_for const do
+    header = cpp_include(header)
+    if try_compile(<<"SRC", opt, &b)
 #{COMMON_HEADERS}
 #{header}
 /* top */
 static int t = #{const};
 SRC
-         $defs.push(
-            format(
-               "-DHAVE_CONST_%s",
-               const.strip.upcase.tr_s("^A-Z0-9_", "_")
-            )
-         )
-         true
-      else
-         false
-      end
-   end
-end
-
-# Check to see if Ruby has already defined the various RLIMIT constants
-# and set an appropriate macro in the source.
-#
-begin
-  Process::RLIMIT_AS
-rescue
-  check_sizeof('int')
-  check_sizeof('long')
-  check_sizeof('long long')
-  unless check_sizeof('rlim_t', 'sys/resource.h')
-    if (2**33).is_a?(Fixnum)
-      $defs.push('-DSIZEOF_RLIM_T 8') # 64 bit
+     $defs.push(
+        format(
+          "-DHAVE_CONST_%s",
+          const.strip.upcase.tr_s("^A-Z0-9_", "_")
+        )
+      )
+      true
     else
-      $defs.push('-DSIZEOF_RLIM_T 4') # 32 bit
+      false
     end
   end
-else
-  $defs.push('-DRUBY_HAS_RLIMIT') # Used within wait.c
 end
 
 have_header('wait.h')

data/ext/proc/wait3.c

@@ -320,7 +320,6 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
    idtype_t idtype;
    id_t id = 0;
    int options = 0;
-   int i = 0;
 
    rb_scan_args(argc, argv, "12", &v_type, &v_id, &v_options);
 
@@ -395,7 +394,10 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
       );
    }
    else{
-      VALUE v_utime = Qnil, v_status = Qnil, v_stime = Qnil, v_fd = Qnil;
+      VALUE v_utime = Qnil, v_status = Qnil, v_stime = Qnil;
+#ifdef HAVE_ST_SI_FD
+      VALUE v_fd = Qnil;
+#endif
 #ifdef HAVE_ST_SI_TRAPNO
       VALUE v_trapno = Qnil;
 #endif
@@ -427,6 +429,10 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
       int sig = infop.si_signo;
       int code = infop.si_code;
 
+#if defined(HAVE_ST_SI_SYSARG) || defined(HAVE_ST_SI_MSTATE)
+      int i = 0;
+#endif
+
       /* If Process.waitid returns because a child process was found that
        * satisfies the conditions indicated by +id_type+ and +options+, then
        * the si_signo struct member will always be SIGCHLD.
@@ -570,12 +576,14 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
  */
 static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
    VALUE v_signals;
-   int i, len;
+   int i;
+   long len;
 
    rb_scan_args(argc, argv, "0*", &v_signals);
 
-   /* Iterate over each signal, calling sigset for each one */
+   // Iterate over each signal, calling sigset for each one
    len = RARRAY_LEN(v_signals);
+
    if(len > 0){
       VALUE v_val;
       char signame[SIG2STR_MAX];
@@ -760,66 +768,6 @@ static VALUE proc_getrusage(int argc, VALUE* argv, VALUE mod){
 }
 #endif
 
-#ifndef RUBY_HAS_RLIMIT
-/*
- * call-seq:
- *    Process.getrlimit(resource) => [cur_limit, max_limit]
- *
- * Returns a two element array consisting of the hard and soft limit
- * for the current process for the given +resource+.  The array consists of
- * either numeric values or the word "infinite".
- */
-static VALUE proc_getrlimit(VALUE mod, VALUE v_resource){
-   struct rlimit limits;
-   VALUE v_array = rb_ary_new();
-
-   rb_secure(2);
-
-   if(getrlimit(NUM2INT(v_resource), &limits) < 0)
-      rb_sys_fail("getrlimit");
-
-   if(limits.rlim_cur == RLIM_INFINITY)
-      rb_ary_push(v_array, rb_str_new2("infinity"));
-   else
-      rb_ary_push(v_array, INT2FIX(limits.rlim_cur));
-
-   if(limits.rlim_max == RLIM_INFINITY)
-      rb_ary_push(v_array, rb_str_new2("infinity"));
-   else
-      rb_ary_push(v_array, INT2FIX(limits.rlim_max));
-
-   return v_array;
-}
-
-/*
- * call-seq:
- *    Process.setrlimit(resource, current, max=nil) => nil
- *
- * Sets the +current+ (soft) and +max+ (hard) limit for the given +resource+
- * for the current process.  If +max+ is nil it is set to the same value as
- * +current+.
- */
-static VALUE proc_setrlimit(int argc, VALUE* argv, VALUE mod){
-   VALUE v_res, v_cur, v_max;
-   struct rlimit limits;
-
-   rb_secure(2);
-
-   rb_scan_args(argc, argv, "21", &v_res, &v_cur, &v_max);
-
-   if(NIL_P(v_max))
-      v_max = v_cur;
-
-   limits.rlim_cur = RLIM2NUM(v_cur);
-   limits.rlim_max = RLIM2NUM(v_max);
-
-   if(setrlimit(NUM2UINT(v_res), &limits) < 0)
-      rb_sys_fail("setrlimit");
-
-   return Qnil;
-}
-#endif
-
 #ifdef HAVE_GETDTABLESIZE
 /*
  * call-seq:
@@ -851,11 +799,6 @@ void Init_wait3()
   rb_define_module_function(rb_mProcess, "wait3", proc_wait3, -1);
   rb_define_module_function(rb_mProcess, "pause", proc_pause, -1);
 
-#ifndef RUBY_HAS_RLIMIT
-  rb_define_module_function(rb_mProcess, "getrlimit", proc_getrlimit, 1);
-  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
@@ -1006,54 +949,8 @@ void Init_wait3()
   rb_define_const(rb_mProcess, "P_PROJID", INT2FIX(P_PROJID));
 #endif
 
-  /* Constants for getrlimit, setrlimit.  It appears that these are defined
-   * by Ruby as of 1.8.5. We'll only set the RLIMIT constants for Ruby 1.8.4
-   * or earlier.
-   */
-#ifndef RUBY_HAS_RLIMIT
-  /* Maximum size of the process' mapped address space, in bytes */
-  rb_define_const(rb_mProcess, "RLIMIT_AS", INT2FIX(RLIMIT_AS));
-
-  /* Maximum size of a core file in bytes that may be created */
-  rb_define_const(rb_mProcess, "RLIMIT_CORE", INT2FIX(RLIMIT_CORE));
-
-  /* Maximum amount of CPU time, in seconds, the process is allowed to use */
-  rb_define_const(rb_mProcess, "RLIMIT_CPU", INT2FIX(RLIMIT_CPU));
-
-  /* Maximum size of the process' heap, in bytes */
-  rb_define_const(rb_mProcess, "RLIMIT_DATA", INT2FIX(RLIMIT_DATA));
-
-  /* Maximum size of a file, in bytes, that the process may create */
-  rb_define_const(rb_mProcess, "RLIMIT_FSIZE", INT2FIX(RLIMIT_FSIZE));
-
-  /* The maximum value that the kernel may assign to a file descriptor */
-  rb_define_const(rb_mProcess, "RLIMIT_NOFILE", INT2FIX(RLIMIT_NOFILE));
-
-  /* The maximum size of the process' stack, in bytes */
-  rb_define_const(rb_mProcess, "RLIMIT_STACK", INT2FIX(RLIMIT_STACK));
-
-  /* No limit on the resource */
-  rb_define_const(rb_mProcess, "RLIM_INFINITY", RLIM2NUM(RLIM_INFINITY));
-
-  /* Set the limit to the corresponding saved hard limit */
-  rb_define_const(rb_mProcess, "RLIM_SAVED_MAX", RLIM2NUM(RLIM_SAVED_MAX));
-
-  /* Set the limit to the corresponding saved soft limit */
-  rb_define_const(rb_mProcess, "RLIM_SAVED_CUR", RLIM2NUM(RLIM_SAVED_CUR));
-
-#ifdef RLIMIT_MEMLOCK
-  /* The maximum number of bytes that may be locked into RAM */
-  rb_define_const(rb_mProcess, "RLIMIT_MEMLOCK", INT2FIX(RLIMIT_MEMLOCK));
-#endif
-
-#ifdef RLIMIT_VMEM
-  /* Synonym for RLIMIT_AS */
-  rb_define_const(rb_mProcess, "RLIMIT_VMEM", INT2FIX(RLIMIT_VMEM));
-#endif
-#endif
-
-  /* 1.5.6: The version of the proc-wait3 library */
-  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.5.6"));
+  /* 1.6.0: The version of the proc-wait3 library */
+  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_new2("1.6.0"));
 
   /* Define this last in our Init_wait3 function */
   rb_define_readonly_variable("$?", &v_last_status);

data/proc-wait3.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'proc-wait3'
-  spec.version    = '1.5.6'
+  spec.version    = '1.6.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -10,20 +10,16 @@ Gem::Specification.new do |spec|
   spec.platform   = Gem::Platform::RUBY
   spec.summary    = 'Adds wait3, wait4 and other methods to the Process module'
   spec.test_file  = 'test/test_proc_wait3.rb'
-  spec.has_rdoc   = true
   spec.extensions = ['ext/extconf.rb']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
-  spec.required_ruby_version = '>= 1.8.2'
-
   spec.rubyforge_project = 'shards'
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'ext/proc/wait3.c']
 
-  spec.add_development_dependency('test-unit', '>= 2.0.3')
+  spec.add_development_dependency('test-unit', '>= 2.1.0')
 
   spec.description = <<-EOF
     The proc-wait3 library 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.
+    and getrusage methods to the Process module.
   EOF
 end

data/test/test_proc_wait3.rb

@@ -37,7 +37,7 @@ class TC_Proc_Wait3 < Test::Unit::TestCase
   end
 
   def test_wait3_version
-    assert_equal('1.5.6', Process::WAIT3_VERSION)
+    assert_equal('1.6.0', Process::WAIT3_VERSION)
   end
 
   def test_wait3_basic

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: proc-wait3
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,20 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -07:00
+date: 2011-08-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-description: "    The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,\n    and getrusage methods to the Process module. It also adds the getrlimit\n    and setrlimit methods for Ruby 1.8.4 or earlier.\n"
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id001
+description: "    The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,\n    and getrusage methods to the Process module.\n"
 email: djberg96@gmail.com
 executables: []
 
@@ -58,21 +68,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds wait3, wait4 and other methods to the Process module