proc-wait3 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e56b25dc085ce18c5808a81d259c4e9f54cb75d1ff985985bb5a575d58ed90
-  data.tar.gz: 65379d28529797369401cc65abb6c234b9cf1995ec7cf92152d03c03c6a89a83
+  metadata.gz: 13f18822c2208220d663b7ddf89cd3ef3763185621f23ed81bf6dced9beb8b76
+  data.tar.gz: 6a82d5550af63215cf4e62b3e390865f5f08e3b3ec30be50128791bf8b9a45a1
 SHA512:
-  metadata.gz: 51f2d1148e8fcadb8b9530420ac164e81b4645b04e3f7b8acded43a62acaa3000240f5e5e53b5fda4cc734f0e2f76edbf76d5b325c2cc3fefd450cf0f60ca519
-  data.tar.gz: ce1e71899e8db9c2c74bb5207d3a715e7cf8b355d0c5b6bc203b51608647d90fe53c0414bce48ee38c1c796987df7f9fa2b4a30c9eeebdd35900e34d288be82a
+  metadata.gz: b015e49e3c835d2855552e3d54f2fdf047d11889f5db55ac2db246d277c9fe3ad1135e73e6cb01a0caa5d88bd93c3de361670d74dc78b3a5139c10ea86db46c7
+  data.tar.gz: f0134f481fa6f8d3cdbdcef1e6f380727afb894e1ed754bd77b568f3a0d43118a3c71aa93f68ea7d96b15768f569fa63199782f91c5c2d729c9efc47cdb0d0ab

data/CHANGES.md

@@ -1,3 +1,6 @@
+## 1.9.3 - 4-May-2024
+* Some internal refactoring where I bzero C structs before using them.
+
 ## 1.9.2 - 21-Apr-2024
 * Added the P_JAILID constant for BSD platforms.
 * Added some notes to the README for coping with EINTR.

data/ext/proc/wait3.c

@@ -154,6 +154,7 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
       flags = NUM2INT(v_flags);
    }
 
+   bzero(&r, sizeof(r));
    pid = wait3(&status, flags, &r);
 
    if(pid < 0){
@@ -226,6 +227,7 @@ static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
    if(RTEST(v_flags))
       flags = NUM2INT(v_flags);
 
+   bzero(&r, sizeof(r));
    pid = wait4(pid, &status, flags, &r);
 
    if(pid < 0){
@@ -587,6 +589,9 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
       int signum;
       struct sigaction act, sa;
 
+      bzero(&act, sizeof(act));
+      bzero(&sa, sizeof(sa));
+
       for(i = 0; i < len; i++){
          v_val = rb_ary_shift(v_signals);
 
@@ -752,6 +757,8 @@ static VALUE proc_getrusage(int argc, VALUE* argv, VALUE mod){
   else if(RTEST(v_children))
     who = RUSAGE_CHILDREN;
 
+  bzero(&r, sizeof(r));
+
   if(getrusage(who,&r) == -1)
     rb_sys_fail("getrusage");
 
@@ -966,8 +973,8 @@ void Init_wait3(void)
   rb_define_const(rb_mProcess, "RUSAGE_THREAD", INT2FIX(RUSAGE_THREAD));
 #endif
 
-  /* 1.9.2: The version of the proc-wait3 library */
-  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("1.9.2")));
+  /* 1.9.3: The version of the proc-wait3 library */
+  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("1.9.3")));
 
   /* Define this last in our Init_wait3 function */
   rb_define_readonly_variable("$last_status", &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.9.2'
+  spec.version    = '1.9.3'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'

data/spec/proc_wait3_spec.rb

@@ -1,26 +1,21 @@
 # frozen_string_literal: true
 
-#######################################################################
+##############################################################################
 # proc_wait3_spec.rb
 #
-# Test suite for the Ruby proc-wait3 library. You should run these
-# via the 'rake spec' task.
-#######################################################################
+# Test suite for the Ruby proc-wait3 library. You should run these via the
+# 'rake spec' task.
+#
+# Note that several specs are deliberately wrapped in EINTR rescue handlers
+# because I think the Ruby interpreter is sending a signal to the process
+# from somewhere in the guts of its core code. Originally I thought this was
+# a SIGCHLD but it doesn't always appear to be.
+##############################################################################
 require 'English'
-require 'proc/wait3'
-require 'rspec'
+require 'spec_helper'
 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
@@ -34,8 +29,26 @@ RSpec.describe Process do
     @pid = nil
   end
 
+  def call_wait3
+    described_class.wait3
+  rescue Errno::EINTR
+    retry
+  end
+
+  def call_wait4(*args)
+    described_class.wait4(*args)
+  rescue Errno::EINTR
+    retry
+  end
+
+  def call_waitid(*args)
+    described_class.waitid(*args)
+  rescue Errno::EINTR
+    retry
+  end
+
   example 'version constant is set to expected value' do
-    expect(Process::WAIT3_VERSION).to eq('1.9.2')
+    expect(Process::WAIT3_VERSION).to eq('1.9.3')
     expect(Process::WAIT3_VERSION).to be_frozen
   end
 
@@ -44,15 +57,13 @@ RSpec.describe Process do
   end
 
   example 'wait3 works as expected' do
-    skip 'wait3 test skipped on this platform' if darwin
     @pid = fork { sleep 0.5 }
-    expect { described_class.wait3 }.not_to raise_error
+    expect { call_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 = described_class.wait3 }.not_to raise_error
+    expect { @proc_stat = call_wait3 }.not_to raise_error
     expect(@proc_stat.members).to eq(proc_stat_members)
   end
 
@@ -62,116 +73,89 @@ RSpec.describe Process do
   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 }
-    described_class.wait3
+    call_wait3
     expect($last_status).to be_a(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 }
-    described_class.wait3
+    call_wait3
     expect($CHILD_STATUS).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 = described_class.wait3
+    struct = call_wait3
     expect(struct).to be_frozen
   end
 
-  example 'getdtablesize works as expected' do
-    skip 'getdtablesize skipped on this platform' unless solaris
-
+  example 'getdtablesize works as expected', :solaris do
     expect(described_class).to respond_to(:getdtablesize)
     expect(described_class.getdtablesize).to be_a(Integer)
     assert(described_class.getdtablesize > 0)
   end
 
-  example 'wait4 method is defined' do
-    skip 'wait4 test skipped on this platform' if hpux
+  example 'wait4 method is defined', :skip_hpux do
     expect(described_class).to respond_to(:wait4)
   end
 
-  example 'wait4 requires at least one argument' do
-    skip 'wait4 test skipped on this platform' if hpux
-    expect { described_class.wait4 }.to raise_error(ArgumentError)
+  example 'wait4 requires at least one argument', :skip_hpux do
+    expect { call_wait4 }.to raise_error(ArgumentError)
   end
 
-  example 'wait4 works as expected' do
-    skip 'wait4 test skipped on this platform' if hpux || darwin
-
+  example 'wait4 works as expected', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    expect { @proc_stat = described_class.wait4(@pid) }.not_to raise_error
+    expect { @proc_stat = call_wait4(@pid) }.not_to raise_error
     expect(@proc_stat).to be_a(Struct::ProcStat)
   end
 
-  example 'wait4 sets and returns $last_status to expected values' do
-    skip 'wait4 test skipped on this platform' if hpux || darwin
-
+  example 'wait4 sets and returns $last_status to expected values', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    described_class.wait4(@pid)
+    call_wait4(@pid)
     expect($last_status).to be_a(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
-
+  example 'wait4 sets pid and status members of $?', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    described_class.wait4(@pid)
+    call_wait4(@pid)
     expect($CHILD_STATUS).not_to be_nil
   end
 
-  example 'wait4 returns frozen struct' do
-    skip 'wait4 test skipped on this platform' if hpux || darwin
-
+  example 'wait4 returns frozen struct', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    struct = described_class.wait4(@pid)
+    struct = call_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
-
+  example 'waitid method is defined', :skip_hpux do
     expect(described_class).to respond_to(:waitid)
   end
 
-  example 'waitid method works as expected' do
-    skip 'waitid test skipped on this platform' if hpux || darwin || bsd
-
+  example 'waitid method works as expected', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    expect { described_class.waitid(Process::P_PID, @pid, Process::WEXITED) }.not_to raise_error
+    expect { call_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
-
+  example 'waitid method raises expected errors if wrong argument type is passed', :skip_hpux do
     @pid = fork { sleep 0.5 }
-    expect { described_class.waitid('foo', @pid, Process::WEXITED) }.to raise_error(TypeError)
-    expect { described_class.waitid(Process::P_PID, @pid, 'foo') }.to raise_error(TypeError)
-    expect { described_class.waitid(Process::P_PID, 'foo', Process::WEXITED) }.to raise_error(TypeError)
+    expect { call_waitid('foo', @pid, Process::WEXITED) }.to raise_error(TypeError)
+    expect { call_waitid(Process::P_PID, @pid, 'foo') }.to raise_error(TypeError)
+    expect { call_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
-
+  example 'waitid method raises expected error if invalid argument is passed', :skip_hpux do
     @pid = fork { sleep 0.5 }
     expect { described_class.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
-
+  example 'sigsend method is defined', :solaris do
     expect(described_class).to respond_to(:sigsend)
   end
 
-  example 'sigsend works as expected' do
-    skip 'sigsend test skipped on this platform' unless solaris
-
+  example 'sigsend works as expected', :solaris do
     @pid = fork { sleep 0.5 }
     expect { described_class.sigsend(Process::P_PID, @pid, 0) }.not_to raise_error
   end
@@ -187,14 +171,11 @@ RSpec.describe Process do
     expect { described_class.getrusage(true) }.not_to raise_error
   end
 
-  example 'getrusage can get thread info on Linux' do
-    skip 'getrusage only tested on Linux' unless linux
+  example 'getrusage can get thread info on Linux', :linux do
     expect { described_class.getrusage(Process::RUSAGE_THREAD) }.not_to raise_error
   end
 
-  example 'getrusage returns the expected struct' do
-    skip 'getrusage only tested on Linux' unless linux
-
+  example 'getrusage returns the expected struct', :linux do
     @pid = fork { sleep 0.5 }
     expect(described_class.getrusage).to be_a(Struct::RUsage)
     expect(described_class.getrusage.stime).to be_a(Float)
@@ -205,21 +186,18 @@ RSpec.describe Process do
     expect(described_class).to respond_to(:pause)
   end
 
-  example 'expected constants are defined' do
-    skip 'wait constant check skipped on this platform' if darwin || bsd
-
+  example 'expected constants are defined', :skip_darwin, :skip_bsd do
     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
+  end
 
-    skip 'WTRAPPED constant check skipped on this platform' if linux
+  example 'expected constant WTRAPPED is defined', :bsd do
     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
-
+  example 'expected process type flag constants are defined', :solaris do
     expect(Process::P_ALL).not_to be_nil
     expect(Process::P_CID).not_to be_nil
     expect(Process::P_GID).not_to be_nil
@@ -227,20 +205,15 @@ RSpec.describe Process do
     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
-
+  example 'solaris-specific process type flags are defined on solaris', :solaris do
     expect(Process::P_TASKID).not_to be_nil
     expect(Process::P_PROJID).not_to be_nil
   end
 
-  example 'bsd-specific process type flags are defined on BSD platforms' do
-    skip 'P_JAILID constant check skipped on this platform' unless bsd
+  example 'bsd-specific process type flags are defined on BSD platforms', :bsd do
     expect(Process::P_JAILID).not_to be_nil
   end
 

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rspec'
+require 'proc-wait3'
+
+RSpec.configure do |config|
+  config.filter_run_excluding(:darwin) if Gem::Platform.local.os !~ /darwin|macos/i
+  config.filter_run_excluding(:solaris) if Gem::Platform.local.os !~ /sunos|solaris/i
+  config.filter_run_excluding(:bsd) if Gem::Platform.local.os !~ /bsd|dragonfly/i
+  config.filter_run_excluding(:linux) if Gem::Platform.local.os !~ /linux/i
+
+  config.filter_run_excluding(:skip_hpux) if Gem::Platform.local.os =~ /hpux/i
+  config.filter_run_excluding(:skip_darwin) if Gem::Platform.local.os =~ /darwin|macos/i
+  config.filter_run_excluding(:skip_bsd) if Gem::Platform.local.os =~ /bsd|dragonfly/i
+  config.filter_run_excluding(:skip_linux) if Gem::Platform.local.os =~ /linux/i
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: proc-wait3
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,6 +120,7 @@ files:
 - lib/proc-wait3.rb
 - proc-wait3.gemspec
 - spec/proc_wait3_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/djberg96/proc-wait3
 licenses:
 - Apache-2.0
@@ -132,7 +133,7 @@ metadata:
   wiki_uri: https://github.com/djberg96/proc-wait3/wiki
   rubygems_mfa_required: 'true'
   github_repo: https://github.com/djberg96/proc-wait3
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Adds wait3, wait4 and other methods to the Process module
 test_files: