proc-wait3 1.8.1 → 1.9.1

data/ext/proc/wait3.c

@@ -29,7 +29,7 @@
 VALUE v_last_status;
 VALUE v_procstat_struct, v_siginfo_struct, v_usage_struct;
 
-static void sigproc(int signum);
+static void sigproc(int signum, siginfo_t* info, void* ucontext);
 
 /*
  * Returns true if this process is stopped. This is only returned
@@ -163,22 +163,22 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
       v_last_status = rb_struct_new(v_procstat_struct,
          INT2FIX(pid),
          INT2FIX(status),
-         INT2FIX(r.ru_utime.tv_sec + (r.ru_utime.tv_usec/1e6)),
-         INT2FIX(r.ru_stime.tv_sec + (r.ru_stime.tv_usec/1e6)),
-         INT2FIX(r.ru_maxrss),
-         INT2FIX(r.ru_ixrss),
-         INT2FIX(r.ru_idrss),
-         INT2FIX(r.ru_isrss),
-         INT2FIX(r.ru_minflt),
-         INT2FIX(r.ru_majflt),
-         INT2FIX(r.ru_nswap),
-         INT2FIX(r.ru_inblock),
-         INT2FIX(r.ru_oublock),
-         INT2FIX(r.ru_msgsnd),
-         INT2FIX(r.ru_msgrcv),
-         INT2FIX(r.ru_nsignals),
-         INT2FIX(r.ru_nvcsw),
-         INT2FIX(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),
          pst_wifstopped(status),
          pst_wifsignaled(status),
          pst_wifexited(status),
@@ -235,22 +235,22 @@ static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
       v_last_status = rb_struct_new(v_procstat_struct,
          INT2FIX(pid),
          INT2FIX(status),
-         INT2FIX(r.ru_utime.tv_sec + (r.ru_utime.tv_usec/1e6)),
-         INT2FIX(r.ru_stime.tv_sec + (r.ru_stime.tv_usec/1e6)),
-         INT2FIX(r.ru_maxrss),
-         INT2FIX(r.ru_ixrss),
-         INT2FIX(r.ru_idrss),
-         INT2FIX(r.ru_isrss),
-         INT2FIX(r.ru_minflt),
-         INT2FIX(r.ru_majflt),
-         INT2FIX(r.ru_nswap),
-         INT2FIX(r.ru_inblock),
-         INT2FIX(r.ru_oublock),
-         INT2FIX(r.ru_msgsnd),
-         INT2FIX(r.ru_msgrcv),
-         INT2FIX(r.ru_nsignals),
-         INT2FIX(r.ru_nvcsw),
-         INT2FIX(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),
          pst_wifstopped(status),
          pst_wifsignaled(status),
          pst_wifexited(status),
@@ -572,7 +572,7 @@ 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;
+   int i, res;
    long len;
 
    rb_scan_args(argc, argv, "0*", &v_signals);
@@ -585,6 +585,7 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
       char signame[SIG2STR_MAX];
       unsigned int max = SIG2STR_MAX;
       int signum;
+      struct sigaction act, sa;
 
       for(i = 0; i < len; i++){
          v_val = rb_ary_shift(v_signals);
@@ -613,7 +614,13 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
             signum = NUM2INT(v_val);
          }
 
-         sigset(signum, sigproc);
+         memset(&act, 0, sizeof(act));
+         act.sa_flags = SA_SIGINFO;
+         act.sa_sigaction = sigproc;
+         res = sigaction(signum, &act, &sa);
+
+         if(res)
+          rb_sys_fail("sigaction");
       }
    }
 
@@ -624,7 +631,7 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
  * This is just a placeholder proc to prevent the "pause" method from exiting
  * the program if the appropriate signal is intercepted.
  */
-static void sigproc(int signum){ /* Do nothing */ }
+static void sigproc(int signum, siginfo_t* info, void* ucontext){ /* Do nothing */ }
 
 #ifdef HAVE_SIGSEND
 /*
@@ -787,7 +794,7 @@ static VALUE proc_getdtablesize(VALUE mod){
  * Adds the wait3, wait4, waitid, pause, sigsend, and getrusage methods to the
  * Process module.
  */
-void Init_wait3()
+void Init_wait3(void)
 {
   v_procstat_struct =
     rb_struct_define("ProcStat","pid","status","utime","stime","maxrss",
@@ -954,8 +961,8 @@ void Init_wait3()
   rb_define_const(rb_mProcess, "RUSAGE_THREAD", INT2FIX(RUSAGE_THREAD));
 #endif
 
-  /* 1.8.1: The version of the proc-wait3 library */
-  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("1.8.1")));
+  /* 1.9.0: The version of the proc-wait3 library */
+  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("1.9.1")));
 
   /* Define this last in our Init_wait3 function */
   rb_define_readonly_variable("$last_status", &v_last_status);

data/proc-wait3.gemspec

@@ -2,30 +2,28 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'proc-wait3'
-  spec.version    = '1.8.1'
+  spec.version    = '1.9.1'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/proc-wait3'
   spec.summary    = 'Adds wait3, wait4 and other methods to the Process module'
-  spec.test_file  = 'test/test_proc_wait3.rb'
+  spec.test_file  = 'spec/proc_wait3_spec.rb'
   spec.extensions = ['ext/extconf.rb']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.cert_chain = Dir['certs/*']
 
-  spec.extra_rdoc_files  = ['CHANGES.rdoc', 'README.rdoc', 'MANIFEST.rdoc', 'ext/proc/wait3.c']
-
-  spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
-  spec.required_ruby_version = '>= 2.2'
+  spec.add_development_dependency('rspec', '~> 3.9')
 
   spec.metadata = {
-    'homepage_uri'      => 'https://github.com/djberg96/proc-wait3',
-    'bug_tracker_uri'   => 'https://github.com/djberg96/proc-wait3/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/proc-wait3/blob/master/CHANGES',
-    'documentation_uri' => 'https://github.com/djberg96/proc-wait3/wiki',
-    'source_code_uri'   => 'https://github.com/djberg96/proc-wait3',
-    'wiki_uri'          => 'https://github.com/djberg96/proc-wait3/wiki'
+    'homepage_uri'          => 'https://github.com/djberg96/proc-wait3',
+    'bug_tracker_uri'       => 'https://github.com/djberg96/proc-wait3/issues',
+    'changelog_uri'         => 'https://github.com/djberg96/proc-wait3/blob/main/CHANGES.md',
+    'documentation_uri'     => 'https://github.com/djberg96/proc-wait3/wiki',
+    'source_code_uri'       => 'https://github.com/djberg96/proc-wait3',
+    'wiki_uri'              => 'https://github.com/djberg96/proc-wait3/wiki',
+    'rubygems_mfa_required' => 'true'
   }
 
   spec.description = <<-EOF

data/spec/proc_wait3_spec.rb

@@ -0,0 +1,242 @@
+#######################################################################
+# proc_wait3_spec.rb
+#
+# Test suite for the Ruby proc-wait3 library. You should run these
+# via the 'rake spec' task.
+#######################################################################
+require 'proc/wait3'
+require 'rspec'
+require 'rbconfig'
+
+RSpec.describe Process do
+  # Something in the guts of Ruby was being a pain.
+  Signal.trap('CHLD', 'IGNORE') if RUBY_VERSION.to_f < 3
+
+  let(:solaris) { RbConfig::CONFIG['host_os'] =~ /sunos|solaris/i }
+  let(:darwin)  { RbConfig::CONFIG['host_os'] =~ /darwin|osx/i }
+  let(:hpux)    { RbConfig::CONFIG['host_os'] =~ /hpux/i }
+  let(:linux)   { RbConfig::CONFIG['host_os'] =~ /linux/i }
+  let(:bsd)     { RbConfig::CONFIG['host_os'] =~ /bsd|dragonfly/i }
+
+  let(:proc_stat_members) {
+    %i[
+      pid status utime stime maxrss ixrss idrss isrss minflt majflt nswap
+      inblock oublock msgsnd msgrcv nsignals nvcsw nivcsw stopped signaled
+      exited success coredump exitstatus termsig stopsig
+    ]
+  }
+
+  before do
+    @proc_stat = nil
+    @pid = nil
+  end
+
+  example "version constant is set to expected value" do
+    expect(Process::WAIT3_VERSION).to eq('1.9.1')
+    expect(Process::WAIT3_VERSION).to be_frozen
+  end
+
+  example "wait3 method is defined" do
+    expect(Process).to respond_to(:wait3)
+  end
+
+  example "wait3 works as expected" do
+    skip 'wait3 test skipped on this platform' if darwin
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.wait3 }.not_to raise_error
+  end
+
+  example "wait3 returns the expected proc status members" do
+    skip 'wait3 test skipped on this platform' if darwin
+    @pid = fork{ sleep 0.5 }
+    expect{ @proc_stat = Process.wait3 }.not_to raise_error
+    expect( @proc_stat.members).to eq(proc_stat_members)
+  end
+
+  example "wait3 with WNOHANG works as expected" do
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.wait3(Process::WNOHANG) }.not_to raise_error
+  end
+
+  example "wait3 sets and returns $last_status to expected values" do
+    skip 'wait3 test skipped on this platform' if darwin
+    @pid = fork{ sleep 0.5 }
+    Process.wait3
+    expect($last_status).to be_kind_of(Struct::ProcStat)
+    expect($last_status).not_to be_nil
+  end
+
+  example "wait3 sets pid and status members of $?" do
+    skip 'wait3 test skipped on this platform' if darwin
+    @pid = fork{ sleep 0.5 }
+    Process.wait3
+    expect($?).not_to be_nil
+  end
+
+  example "wait3 returns frozen struct" do
+    skip 'wait3 test skipped on this platform' if darwin
+    @pid = fork{ sleep 0.5 }
+    struct = Process.wait3
+    expect(struct).to be_frozen
+  end
+
+  example "getdtablesize works as expected" do
+    skip 'getdtablesize skipped on this platform' unless solaris
+
+    expect(Process).to respond_to(:getdtablesize)
+    expect(Process.getdtablesize).to be_kind_of(Fixnum)
+    assert(Process.getdtablesize > 0)
+  end
+
+  example "wait4 method is defined" do
+    skip 'wait4 test skipped on this platform' if hpux
+    expect(Process).to respond_to(:wait4)
+  end
+
+  example "wait4 requires at least one argument" do
+    skip 'wait4 test skipped on this platform' if hpux
+    expect{ Process.wait4 }.to raise_error(ArgumentError)
+  end
+
+  example "wait4 works as expected" do
+    skip 'wait4 test skipped on this platform' if hpux || darwin
+
+    @pid = fork{ sleep 0.5 }
+    expect{ @proc_stat = Process.wait4(@pid) }.not_to raise_error
+    expect(@proc_stat).to be_kind_of(Struct::ProcStat)
+  end
+
+  example "wait4 sets and returns $last_status to expected values" do
+    skip 'wait4 test skipped on this platform' if hpux || darwin
+
+    @pid = fork{ sleep 0.5 }
+    Process.wait4(@pid)
+    expect($last_status).to be_kind_of(Struct::ProcStat)
+    expect($last_status).not_to be_nil
+  end
+
+  example "wait4 sets pid and status members of $?" do
+    skip 'wait4 test skipped on this platform' if hpux || darwin
+
+    @pid = fork{ sleep 0.5 }
+    Process.wait4(@pid)
+    expect($?).not_to be_nil
+  end
+
+  example "wait4 returns frozen struct" do
+    skip 'wait4 test skipped on this platform' if hpux || darwin
+
+    @pid = fork{ sleep 0.5 }
+    struct = Process.wait4(@pid)
+    expect(struct).to be_frozen
+  end
+
+  example "waitid method is defined" do
+    skip 'waitid test skipped on this platform' if hpux || darwin || bsd
+
+    expect(Process).to respond_to(:waitid)
+  end
+
+  example "waitid method works as expected" do
+    skip 'waitid test skipped on this platform' if hpux || darwin || bsd
+
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.waitid(Process::P_PID, @pid, Process::WEXITED) }.not_to raise_error
+  end
+
+  example "waitid method raises expected errors if wrong argument type is passed" do
+    skip 'waitid test skipped on this platform' if hpux || darwin || bsd
+
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.waitid("foo", @pid, Process::WEXITED) }.to raise_error(TypeError)
+    expect{ Process.waitid(Process::P_PID, @pid, "foo") }.to raise_error(TypeError)
+    expect{ Process.waitid(Process::P_PID, "foo", Process::WEXITED) }.to raise_error(TypeError)
+  end
+
+  example "waitid method raises expected error if invalid argument is passed" do
+    skip 'waitid test skipped on this platform' if hpux || darwin || bsd
+
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.waitid(Process::P_PID, 99999999, Process::WEXITED) }.to raise_error(Errno::ECHILD)
+  end
+
+  example "sigsend method is defined" do
+    skip 'sigsend test skipped on this platform' unless solaris
+
+    expect(Process).to respond_to(:sigsend)
+  end
+
+  example "sigsend works as expected" do
+    skip 'sigsend test skipped on this platform' unless solaris
+
+    @pid = fork{ sleep 0.5 }
+    expect{ Process.sigsend(Process::P_PID, @pid, 0) }.not_to raise_error
+  end
+
+  example "getrusage method is defined" do
+    expect(Process).to respond_to(:getrusage)
+  end
+
+  example "getrusage works as expected" do
+    @pid = fork{ sleep 0.5 }
+
+    expect{ Process.getrusage }.not_to raise_error
+    expect{ Process.getrusage(true) }.not_to raise_error
+  end
+
+  example "getrusage can get thread info on Linux" do
+    skip 'getrusage only tested on Linux' unless linux
+    expect{ Process.getrusage(Process::RUSAGE_THREAD) }.not_to raise_error
+  end
+
+  example "getrusage returns the expected struct" do
+    skip 'getrusage only tested on Linux' unless linux
+
+    @pid = fork{ sleep 0.5 }
+    expect(Process.getrusage).to be_kind_of(Struct::RUsage)
+    expect(Process.getrusage.stime).to be_kind_of(Float)
+    expect(Process.getrusage.utime).to be_kind_of(Float)
+  end
+
+  example "pause method is defined" do
+    expect(Process).to respond_to(:pause)
+  end
+
+  example "expected constants are defined" do
+    skip 'wait constant check skipped on this platform' if darwin || bsd
+
+    expect(Process::WCONTINUED).not_to be_nil
+    expect(Process::WEXITED).not_to be_nil
+    expect(Process::WNOWAIT).not_to be_nil
+    expect(Process::WSTOPPED).not_to be_nil
+
+    skip 'WTRAPPED constant check skipped on this platform' if linux
+    expect(Process::WTRAPPED).not_to be_nil
+  end
+
+  example "expected process type flag constants are defined" do
+    skip 'process type flag check skipped on this platform' if linux || darwin || bsd
+
+    expect(Process::P_ALL).not_to be_nil
+    expect(Process::P_CID).not_to be_nil
+    expect(Process::P_GID).not_to be_nil
+    expect(Process::P_PGID).not_to be_nil
+    expect(Process::P_PID).not_to be_nil
+    expect(Process::P_SID).not_to be_nil
+    expect(Process::P_UID).not_to be_nil
+
+    skip 'P_MYID constant check skipped on this platform' unless solaris
+    expect(Process::P_MYID).not_to be_nil
+  end
+
+  example "solaris-specific process type flags are defined on solaris" do
+    skip 'P_TASKID and P_PROJID constant check skipped on this platform' unless solaris
+
+    expect(Process::P_TASKID).not_to be_nil
+    expect(Process::P_PROJID).not_to be_nil
+  end
+
+  def after
+    Process.kill(9, @pid) if @pid
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: proc-wait3
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.1
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,10 +35,10 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,19 +52,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 description: |2
       The proc-wait3 library adds the wait3, wait4, waitid, pause, sigsend,
       and getrusage methods to the Process module.
@@ -72,47 +72,38 @@ email: djberg96@gmail.com
 executables: []
 extensions:
 - ext/extconf.rb
-extra_rdoc_files:
-- CHANGES.rdoc
-- README.rdoc
-- MANIFEST.rdoc
-- ext/proc/wait3.c
+extra_rdoc_files: []
 files:
+- CHANGES.md
+- Gemfile
 - LICENSE
-- test
-- test/test_proc_wait3.rb
-- ext
-- ext/proc
-- ext/proc/wait3.c
-- ext/extconf.rb
+- MANIFEST.md
+- README.md
 - Rakefile
-- certs
 - certs/djberg96_pub.pem
-- examples
-- examples/example_wait4.rb
-- examples/example_wait3.rb
+- doc/wait3.md
 - examples/example_getrusage.rb
 - examples/example_pause.rb
+- examples/example_wait3.rb
+- examples/example_wait4.rb
 - examples/example_waitid.rb
-- lib
+- ext/extconf.rb
+- ext/proc/wait3.c
 - lib/proc-wait3.rb
-- CHANGES.rdoc
-- doc
-- doc/wait3.txt
-- MANIFEST.rdoc
 - proc-wait3.gemspec
-- README.rdoc
+- spec/proc_wait3_spec.rb
 homepage: https://github.com/djberg96/proc-wait3
 licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/djberg96/proc-wait3
   bug_tracker_uri: https://github.com/djberg96/proc-wait3/issues
-  changelog_uri: https://github.com/djberg96/proc-wait3/blob/master/CHANGES
+  changelog_uri: https://github.com/djberg96/proc-wait3/blob/main/CHANGES.md
   documentation_uri: https://github.com/djberg96/proc-wait3/wiki
   source_code_uri: https://github.com/djberg96/proc-wait3
   wiki_uri: https://github.com/djberg96/proc-wait3/wiki
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,16 +111,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Adds wait3, wait4 and other methods to the Process module
 test_files:
-- test/test_proc_wait3.rb
+- spec/proc_wait3_spec.rb