proc-wait3 1.9.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f18822c2208220d663b7ddf89cd3ef3763185621f23ed81bf6dced9beb8b76
-  data.tar.gz: 6a82d5550af63215cf4e62b3e390865f5f08e3b3ec30be50128791bf8b9a45a1
+  metadata.gz: d9ed8e7bd3a3b5631bbb5e2a4d658c60d1876e8880ebc95eab77f920d81b26be
+  data.tar.gz: fa72e2f110aa9a1c4858d7c7a51cc072f115d7de0e63c7f7f0fca0210d26315e
 SHA512:
-  metadata.gz: b015e49e3c835d2855552e3d54f2fdf047d11889f5db55ac2db246d277c9fe3ad1135e73e6cb01a0caa5d88bd93c3de361670d74dc78b3a5139c10ea86db46c7
-  data.tar.gz: f0134f481fa6f8d3cdbdcef1e6f380727afb894e1ed754bd77b568f3a0d43118a3c71aa93f68ea7d96b15768f569fa63199782f91c5c2d729c9efc47cdb0d0ab
+  metadata.gz: 027c982ad10f5e7a66bdac1e8406df6f99f4372dd739da56b4a5c05bf9115e58bda7e6fbd5b72a3b6e3734ad652928bb3dbc4750a86a70252abc7541b0792613
+  data.tar.gz: 0b8289e6c28ce586d9a8f932e31b4e7dd39edfc223061a07d85ff8f8a28daf50329df4933079fcf347c592aaf9d9538ee9de78e448022222294b2a2c2ba5b91e

checksums.yaml.gz.sig

@@ -1,5 +1,5 @@
-e��)#
-�P�H�s�/w��"�
-���񬫖|.6;_i�<;����;�"Zl{����u_dE�oM������ǑW�X��_&�i*\ak�l����GoMx|y�"@���|��4G�����jF�ح3���=��R�YK
-�Vo6�.�k0Z�����E�4Z�JJ�G�ڝ"�c�8���s�[<~Vw�a-�NF��+	{�쌌��s{�
-#����Qw��4w�j
+J�����M
�%����	Z"s��n�IY;;B�0��c?B�=Oq��N��t��XH���C׉�x��=_��	���<O�P�PC]]c1�u���mM����&d��敔�mo�
+�V:m`h\ �'���Qb|�b��{�B�7vuE�>dC�{Sa�B��G�p
+E���y+�t#=��D�\�ūgDh�K{�Tq��� �+�x��B>w��>��g�g�^��k���W�x�H��O%�1n`���}
+��#�/?��
+ڪ)�/>mH��.҅U�u�������`ޖ��x����Wnv���1|�/�4�L��	��GC�W."���2�m_ڳ�BOLY�7gf�� �)m��FQC�ړY8���D���S��|�K�

data/CHANGES.md

@@ -1,3 +1,21 @@
+## 2.1.0 - 18-Jan-2026
+* Modified the wait methods to automatically loop on EINTR for consistent
+  cross-platform behavior. Previously you had to do this manually on some
+  platforms, e.g. OSX.
+
+## 2.0.0 - 10-Jan-2026
+* Added fiber scheduler support for wait3 and wait4 methods, allowing them
+  to cooperate with Ruby's fiber scheduler for non-blocking async operations.
+  Note that rusage fields will be zero when using the fiber scheduler path.
+* Added `rb_thread_call_without_gvl` for blocking calls so that other Ruby
+  threads can run while waiting.
+* Added `RB_GC_GUARD` to protect Ruby objects during blocking operations.
+* Replaced deprecated `RSTRING()->len` and `RSTRING()->ptr` with `RSTRING_LEN()`
+  and `RSTRING_PTR()` macros.
+* Added missing `HAVE_STRLCPY` guard in sigsend with strncpy fallback.
+* Fixed some minor whitespace inconsistencies.
+* Now requires Ruby 3.1 or later.
+
 ## 1.9.3 - 4-May-2024
 * Some internal refactoring where I bzero C structs before using them.
 
@@ -157,7 +175,7 @@
 * Updated tests and documentation.
 
 ## 1.2.0 - 7-Feb-2005
-* Added the Proc.waitid method (for those platforms that support it). 
+* Added the Proc.waitid method (for those platforms that support it).
 * Made the wait3.c file more rdoc friendly.
 * Added a test_waitid.rb file in the examples directory.
 

data/README.md

@@ -70,6 +70,9 @@ BSD provides another approach using sigaction handlers + `SA_RESTART`, but it re
 the signal type in advance. So, unless you want to apply the same handler to *every* type of
 signal, I don't find it especially useful.
 
+Update: As of version 2.1.0 you should no longer have to manually rescue EINTR since it's now
+being handled internally.
+
 ## Integration with Ruby's process.c
 I considered simply providing a patch to the core process.c file, but I
 decided against it for two reasons.  First, I wanted to get something

data/Rakefile

@@ -7,17 +7,17 @@ require 'rbconfig'
 include RbConfig
 
 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
-  '**/*.lock'                # Bundler
+  '**/*.gem',                 # Gem files
+  '**/*.rbc',                 # Rubinius
+  '**/*.o',                   # C object file
+  '**/*.log',                 # Ruby extension build log
+  '**/*.lock',                # Gemfile.lock
+  '**/Makefile',              # C Makefile
+  '**/*.dSYM',                # OS X build directory
+  "**/*.#{CONFIG['DLEXT']}",  # C shared object
+  '**/*.lock'                 # Bundler
 )
 
-
 desc "Build the source (but don't install it)"
 task :build => [:clean] do |t|
   Dir.chdir('ext') do
@@ -72,7 +72,12 @@ end
 
 desc 'Run the test suite'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '-Iext'
+  t.rspec_opts = '-Iext -f documentation -w'
+end
+
+# Clean up afterwards
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
 end
 
 task :default => [:build, :spec]

data/doc/wait3.md

@@ -80,6 +80,13 @@ Returns a `Proc::SigInfo` struct and sets `$?`.
 
 Not supported on all platforms.
 
+### `Proc.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.
+
 ## Standard Constants
 `Process::WAIT3_VERSION`
 
@@ -209,7 +216,7 @@ page at https://github.com/djberg96/proc-wait3.
 Apache-2.0
 
 ## Copyright
-(C) 2003-2024 Daniel J. Berger
+(C) 2003-2026 Daniel J. Berger
 
 All Rights Reserved.
 

data/examples/example_waitid.rb

@@ -8,10 +8,20 @@
 #
 # Modify as you see fit.
 #######################################################################
-require 'English'
 require 'proc/wait3'
 
-pid = fork { sleep 2 }
+pid1 = fork { puts "PID1 GRP: #{Process.getpgrp}"; sleep 2 }
+pid2 = fork { puts "PID2 GRP: #{Process.getpgrp}"; sleep 3 }
+pid3 = fork { puts "PID2 GRP: #{Process.getpgrp}"; sleep 4 }
+
+puts "PID1: #{pid1}"
+puts "PID2: #{pid2}"
+puts "PID3: #{pid3}"
+
+puts "MAIN GRP: #{Process.getpgrp}"
 p Time.now
-Process.waitid(Process::P_PID, pid, Process::WEXITED)
-p $CHILD_STATUS
+
+status = Process.waitid(Process::P_PGID, Process.getpgrp, Process::WEXITED)
+
+# status.pid should equal pid1 since it exits first
+p status

data/ext/proc/wait3.c

@@ -1,6 +1,9 @@
 #include <ruby.h>
+#include <ruby/thread.h>
+#include <ruby/fiber/scheduler.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 /* Debian */
 #ifdef HAVE_SYS_RESOURCE_H
@@ -31,6 +34,67 @@ VALUE v_procstat_struct, v_siginfo_struct, v_usage_struct;
 
 static void sigproc(int signum, siginfo_t* info, void* ucontext);
 
+/* Structs for rb_thread_call_without_gvl wrappers */
+struct wait3_args {
+   int status;
+   int flags;
+   struct rusage rusage;
+   pid_t pid;
+};
+
+#ifdef HAVE_WAIT4
+struct wait4_args {
+   pid_t pid;
+   int status;
+   int flags;
+   struct rusage rusage;
+   pid_t result;
+};
+#endif
+
+#ifdef HAVE_WAITID
+struct waitid_args {
+   idtype_t idtype;
+   id_t id;
+   siginfo_t infop;
+   int options;
+   int result;
+};
+#endif
+
+struct pause_args {
+   int result;
+};
+
+/* GVL-free wrapper functions */
+static void* wait3_without_gvl(void* data) {
+   struct wait3_args* args = (struct wait3_args*)data;
+   args->pid = wait3(&args->status, args->flags, &args->rusage);
+   return NULL;
+}
+
+#ifdef HAVE_WAIT4
+static void* wait4_without_gvl(void* data) {
+   struct wait4_args* args = (struct wait4_args*)data;
+   args->result = wait4(args->pid, &args->status, args->flags, &args->rusage);
+   return NULL;
+}
+#endif
+
+#ifdef HAVE_WAITID
+static void* waitid_without_gvl(void* data) {
+   struct waitid_args* args = (struct waitid_args*)data;
+   args->result = waitid(args->idtype, args->id, &args->infop, args->options);
+   return NULL;
+}
+#endif
+
+static void* pause_without_gvl(void* data) {
+   struct pause_args* args = (struct pause_args*)data;
+   args->result = pause();
+   return NULL;
+}
+
 /*
  * Returns true if this process is stopped. This is only returned
  * returned if the corresponding wait() call had the WUNTRACED flag
@@ -38,10 +102,10 @@ static void sigproc(int signum, siginfo_t* info, void* ucontext);
  */
 static VALUE pst_wifstopped(int status)
 {
-   if(WIFSTOPPED(status))
-      return Qtrue;
-   else
-      return Qfalse;
+  if(WIFSTOPPED(status))
+    return Qtrue;
+  else
+    return Qfalse;
 }
 
 /*
@@ -50,7 +114,7 @@ static VALUE pst_wifstopped(int status)
 static VALUE pst_wifsignaled(int status)
 {
   if (WIFSIGNALED(status))
-	  return Qtrue;
+    return Qtrue;
   else
     return Qfalse;
 }
@@ -131,6 +195,42 @@ static VALUE pst_wstopsig(int status)
   return Qnil;
 }
 
+/*
+ * Helper to build ProcStat struct from pid and status.
+ * Used by fiber scheduler path where rusage is not available.
+ * All rusage fields are set to 0.
+ */
+static VALUE build_procstat_without_rusage(pid_t pid, int status) {
+   return rb_struct_new(v_procstat_struct,
+      INT2FIX(pid),
+      INT2FIX(status),
+      rb_float_new(0.0),  /* utime - not available via fiber scheduler */
+      rb_float_new(0.0),  /* stime - not available via fiber scheduler */
+      LONG2NUM(0),        /* maxrss */
+      LONG2NUM(0),        /* ixrss */
+      LONG2NUM(0),        /* idrss */
+      LONG2NUM(0),        /* isrss */
+      LONG2NUM(0),        /* minflt */
+      LONG2NUM(0),        /* majflt */
+      LONG2NUM(0),        /* nswap */
+      LONG2NUM(0),        /* inblock */
+      LONG2NUM(0),        /* oublock */
+      LONG2NUM(0),        /* msgsnd */
+      LONG2NUM(0),        /* msgrcv */
+      LONG2NUM(0),        /* nsignals */
+      LONG2NUM(0),        /* nvcsw */
+      LONG2NUM(0),        /* nivcsw */
+      pst_wifstopped(status),
+      pst_wifsignaled(status),
+      pst_wifexited(status),
+      pst_success_p(status),
+      pst_wcoredump(status),
+      pst_wexitstatus(status),
+      pst_wtermsig(status),
+      pst_wstopsig(status)
+   );
+}
+
 /*
  * call-seq:
  *    Process.wait3(flags=nil)
@@ -140,13 +240,15 @@ static VALUE pst_wstopsig(int status)
  *
  * The return value is a ProcStat structure. The special global $? is also
  * set. Raises a SystemError if there are no child processes.
+ *
+ * Note: When a fiber scheduler is active (Ruby 3.0+), this method will
+ * cooperate with the scheduler. However, rusage information will not be
+ * available and those fields will be set to 0 in the returned struct.
  */
 static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
-   int status;
-   int flags = 0;
-   struct rusage r;
-   pid_t pid;
+   struct wait3_args args;
    VALUE v_flags = Qnil;
+   int flags = 0;
 
    rb_scan_args(argc,argv,"01",&v_flags);
 
@@ -154,43 +256,75 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
       flags = NUM2INT(v_flags);
    }
 
-   bzero(&r, sizeof(r));
-   pid = wait3(&status, flags, &r);
+   VALUE scheduler = rb_fiber_scheduler_current();
+   if (!NIL_P(scheduler)) {
+      /* Use fiber scheduler - wait for any child (pid = -1) */
+      VALUE result = rb_fiber_scheduler_process_wait(scheduler, (rb_pid_t)-1, flags);
+
+      if (NIL_P(result)) {
+         return Qnil;
+      }
 
-   if(pid < 0){
+      /* Extract pid and status from Process::Status object */
+      pid_t pid = NUM2PIDT(rb_funcall(result, rb_intern("pid"), 0));
+      int status = NUM2INT(rb_funcall(result, rb_intern("to_i"), 0));
+
+      RB_GC_GUARD(result);
+
+      v_last_status = build_procstat_without_rusage(pid, status);
+      rb_last_status_set(status, pid);
+      OBJ_FREEZE(v_last_status);
+
+      return v_last_status;
+   }
+
+   /* No fiber scheduler - use thread-based blocking */
+   bzero(&args, sizeof(args));
+   args.flags = flags;
+
+   /* Retry on EINTR. The RUBY_UBF_PROCESS unblocking function sends a signal
+    * to interrupt the blocking call. On macOS (and some other platforms),
+    * wait3() is not automatically restarted after being interrupted, so we
+    * must retry manually.
+    */
+   do {
+      rb_thread_call_without_gvl(wait3_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   } while(args.pid < 0 && errno == EINTR);
+
+   if(args.pid < 0){
       rb_sys_fail("wait3");
    }
-   else if(pid > 0){
+   else if(args.pid > 0){
       v_last_status = rb_struct_new(v_procstat_struct,
-         INT2FIX(pid),
-         INT2FIX(status),
-         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),
-         pst_success_p(status),
-         pst_wcoredump(status),
-         pst_wexitstatus(status),
-         pst_wtermsig(status),
-         pst_wstopsig(status)
+         INT2FIX(args.pid),
+         INT2FIX(args.status),
+         rb_float_new((double)args.rusage.ru_utime.tv_sec+(double)args.rusage.ru_utime.tv_usec/1e6),
+         rb_float_new((double)args.rusage.ru_stime.tv_sec+(double)args.rusage.ru_stime.tv_usec/1e6),
+         LONG2NUM(args.rusage.ru_maxrss),
+         LONG2NUM(args.rusage.ru_ixrss),
+         LONG2NUM(args.rusage.ru_idrss),
+         LONG2NUM(args.rusage.ru_isrss),
+         LONG2NUM(args.rusage.ru_minflt),
+         LONG2NUM(args.rusage.ru_majflt),
+         LONG2NUM(args.rusage.ru_nswap),
+         LONG2NUM(args.rusage.ru_inblock),
+         LONG2NUM(args.rusage.ru_oublock),
+         LONG2NUM(args.rusage.ru_msgsnd),
+         LONG2NUM(args.rusage.ru_msgrcv),
+         LONG2NUM(args.rusage.ru_nsignals),
+         LONG2NUM(args.rusage.ru_nvcsw),
+         LONG2NUM(args.rusage.ru_nivcsw),
+         pst_wifstopped(args.status),
+         pst_wifsignaled(args.status),
+         pst_wifexited(args.status),
+         pst_success_p(args.status),
+         pst_wcoredump(args.status),
+         pst_wexitstatus(args.status),
+         pst_wtermsig(args.status),
+         pst_wstopsig(args.status)
       );
 
-      rb_last_status_set(status, pid);
+      rb_last_status_set(args.status, args.pid);
       OBJ_FREEZE(v_last_status);
 
       return v_last_status;
@@ -211,59 +345,95 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
  * This method is not supported on all platforms.
  *
  * Some +flags+ are not supported on all platforms.
+ *
+ * Note: When a fiber scheduler is active (Ruby 3.0+), this method will
+ * cooperate with the scheduler. However, rusage information will not be
+ * available and those fields will be set to 0 in the returned struct.
  */
 static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
-   int status;
-   int flags = 0;
-   struct rusage r;
-   pid_t pid;
+   struct wait4_args args;
    VALUE v_pid;
    VALUE v_flags = Qnil;
+   pid_t pid;
+   int flags = 0;
 
    rb_scan_args(argc, argv, "11", &v_pid, &v_flags);
 
-   pid = NUM2INT(v_pid);
+   pid = NUM2PIDT(v_pid);
 
    if(RTEST(v_flags))
       flags = NUM2INT(v_flags);
 
-   bzero(&r, sizeof(r));
-   pid = wait4(pid, &status, flags, &r);
+   VALUE scheduler = rb_fiber_scheduler_current();
+   if (!NIL_P(scheduler)) {
+      /* Use fiber scheduler */
+      VALUE result = rb_fiber_scheduler_process_wait(scheduler, pid, flags);
+
+      if (NIL_P(result)) {
+         return Qnil;
+      }
+
+      /* Extract pid and status from Process::Status object */
+      pid_t rpid = NUM2PIDT(rb_funcall(result, rb_intern("pid"), 0));
+      int status = NUM2INT(rb_funcall(result, rb_intern("to_i"), 0));
 
-   if(pid < 0){
+      RB_GC_GUARD(result);
+
+      v_last_status = build_procstat_without_rusage(rpid, status);
+      rb_last_status_set(status, rpid);
+      OBJ_FREEZE(v_last_status);
+
+      return v_last_status;
+   }
+
+   /* No fiber scheduler - use thread-based blocking */
+   bzero(&args, sizeof(args));
+   args.pid = pid;
+   args.flags = flags;
+
+   /* Retry on EINTR. The RUBY_UBF_PROCESS unblocking function sends a signal
+    * to interrupt the blocking call. On macOS (and some other platforms),
+    * wait4() is not automatically restarted after being interrupted, so we
+    * must retry manually.
+    */
+   do {
+      rb_thread_call_without_gvl(wait4_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   } while(args.result < 0 && errno == EINTR);
+
+   if(args.result < 0){
       rb_sys_fail("wait4");
    }
-   else if(pid > 0){
+   else if(args.result > 0){
       v_last_status = rb_struct_new(v_procstat_struct,
-         INT2FIX(pid),
-         INT2FIX(status),
-         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),
-         pst_success_p(status),
-         pst_wcoredump(status),
-         pst_wexitstatus(status),
-         pst_wtermsig(status),
-         pst_wstopsig(status)
+         INT2FIX(args.result),
+         INT2FIX(args.status),
+         rb_float_new((double)args.rusage.ru_utime.tv_sec+(double)args.rusage.ru_utime.tv_usec/1e6),
+         rb_float_new((double)args.rusage.ru_stime.tv_sec+(double)args.rusage.ru_stime.tv_usec/1e6),
+         LONG2NUM(args.rusage.ru_maxrss),
+         LONG2NUM(args.rusage.ru_ixrss),
+         LONG2NUM(args.rusage.ru_idrss),
+         LONG2NUM(args.rusage.ru_isrss),
+         LONG2NUM(args.rusage.ru_minflt),
+         LONG2NUM(args.rusage.ru_majflt),
+         LONG2NUM(args.rusage.ru_nswap),
+         LONG2NUM(args.rusage.ru_inblock),
+         LONG2NUM(args.rusage.ru_oublock),
+         LONG2NUM(args.rusage.ru_msgsnd),
+         LONG2NUM(args.rusage.ru_msgrcv),
+         LONG2NUM(args.rusage.ru_nsignals),
+         LONG2NUM(args.rusage.ru_nvcsw),
+         LONG2NUM(args.rusage.ru_nivcsw),
+         pst_wifstopped(args.status),
+         pst_wifsignaled(args.status),
+         pst_wifexited(args.status),
+         pst_success_p(args.status),
+         pst_wcoredump(args.status),
+         pst_wexitstatus(args.status),
+         pst_wtermsig(args.status),
+         pst_wstopsig(args.status)
       );
 
-      rb_last_status_set(status, pid);
+      rb_last_status_set(args.status, args.result);
       OBJ_FREEZE(v_last_status);
 
       return v_last_status;
@@ -314,20 +484,18 @@ static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
  */
 static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
    VALUE v_type, v_id, v_options;
-   siginfo_t infop;
-   idtype_t idtype;
-   id_t id = 0;
-   int options = 0;
+   struct waitid_args args;
 
    rb_scan_args(argc, argv, "12", &v_type, &v_id, &v_options);
 
-   idtype = NUM2INT(v_type);
+   bzero(&args, sizeof(args));
+   args.idtype = NUM2INT(v_type);
 
    if(RTEST(v_id))
-      id = NUM2INT(v_id);
+      args.id = NUM2INT(v_id);
 
    if(RTEST(v_options))
-      options = NUM2INT(v_options);
+      args.options = NUM2INT(v_options);
 
    /* The Linux man page for waitid() says to zero out the pid field and check
     * its value after the call to waitid() to detect if there were children in
@@ -335,10 +503,19 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
     * simply check the infop.si_signo struct member against SI_NOINFO.
     */
 #ifndef SI_NOINFO
-   infop.si_pid = 0;
+   args.infop.si_pid = 0;
 #endif
 
-   if(waitid(idtype, id, &infop, options) == -1)
+   /* Retry on EINTR. The RUBY_UBF_PROCESS unblocking function sends a signal
+    * to interrupt the blocking call. On macOS (and some other platforms),
+    * waitid() is not automatically restarted after being interrupted, so we
+    * must retry manually.
+    */
+   do {
+      rb_thread_call_without_gvl(waitid_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   } while(args.result == -1 && errno == EINTR);
+
+   if(args.result == -1)
       rb_sys_fail("waitid");
 
     /* If the si_code struct member returns SI_NOINFO, or the si_pid member
@@ -352,13 +529,13 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
      */
 
 #ifdef SI_NOINFO
-   if(infop.si_code == SI_NOINFO){
+   if(args.infop.si_code == SI_NOINFO){
 #else
-   if(infop.si_pid == 0){
+   if(args.infop.si_pid == 0){
 #endif
       v_last_status = rb_struct_new(v_siginfo_struct,
-         INT2FIX(infop.si_signo),
-         INT2FIX(infop.si_errno),
+         INT2FIX(args.infop.si_signo),
+         INT2FIX(args.infop.si_errno),
          Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, /* code, pid, uid, utime, status, stime */
 #ifdef HAVE_ST_SI_TRAPNO
          Qnil,
@@ -424,8 +601,8 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
       VALUE v_state = Qnil;
 #endif
       VALUE v_band = Qnil, v_entity = Qnil;
-      int sig = infop.si_signo;
-      int code = infop.si_code;
+      int sig = args.infop.si_signo;
+      int code = args.infop.si_code;
 
 #if defined(HAVE_ST_SI_SYSARG) || defined(HAVE_ST_SI_MSTATE)
       int i = 0;
@@ -437,13 +614,13 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
        */
       if(sig == SIGCHLD){
 #ifdef HAVE_ST_SI_UTIME
-         v_utime  = ULL2NUM(infop.si_utime);
+         v_utime  = ULL2NUM(args.infop.si_utime);
 #endif
 #ifdef HAVE_ST_SI_STATUS
-         v_status = ULL2NUM(infop.si_status);
+         v_status = ULL2NUM(args.infop.si_status);
 #endif
 #ifdef HAVE_ST_SI_STIME
-         v_stime  = ULL2NUM(infop.si_stime);
+         v_stime  = ULL2NUM(args.infop.si_stime);
 #endif
       }
 
@@ -451,66 +628,66 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
          sig == SIGTRAP)
       {
 #ifdef HAVE_ST_SI_TRAPNO
-         v_trapno = INT2FIX(infop.si_trapno);
+         v_trapno = INT2FIX(args.infop.si_trapno);
 #endif
 #ifdef HAVE_ST_SI_PC
-         v_pc = INT2FIX(infop.si_pc);
+         v_pc = INT2FIX(args.infop.si_pc);
 #endif
       }
 
       if(sig == SIGXFSZ){
 #ifdef HAVE_ST_SI_FD
-         v_fd = INT2FIX(infop.si_fd);
+         v_fd = INT2FIX(args.infop.si_fd);
 #endif
          if(code == POLL_IN || code == POLL_OUT || code == POLL_MSG){
-            v_band = LONG2FIX(infop.si_band);
+            v_band = LONG2FIX(args.infop.si_band);
          }
       }
 
       if(sig == SIGPROF){
 #ifdef HAVE_ST_SI_SYSARG
-         int ssize = sizeof(infop.si_sysarg) / sizeof(infop.si_sysarg[0]);
+         int ssize = sizeof(args.infop.si_sysarg) / sizeof(args.infop.si_sysarg[0]);
          v_sysarg  = rb_ary_new();
 
          for(i = 0; i < ssize; i++)
-            rb_ary_push(v_sysarg, LONG2FIX(infop.si_sysarg[i]));
+            rb_ary_push(v_sysarg, LONG2FIX(args.infop.si_sysarg[i]));
 #endif
 #ifdef HAVE_ST_SI_MSTATE
-         int msize = sizeof(infop.si_mstate) / sizeof(infop.si_mstate[0]);
+         int msize = sizeof(args.infop.si_mstate) / sizeof(args.infop.si_mstate[0]);
          v_state  = rb_ary_new();
 
          for(i = 0; i < msize; i++)
-            rb_ary_push(v_state, INT2FIX(infop.si_mstate[i]));
+            rb_ary_push(v_state, INT2FIX(args.infop.si_mstate[i]));
 #endif
 #ifdef HAVE_ST_SI_FADDR
-         v_addr   = INT2FIX(infop.si_faddr);
+         v_addr   = INT2FIX(args.infop.si_faddr);
 #endif
 #ifdef HAVE_ST_SI_SYSCALL
-         v_syscall = INT2FIX(infop.si_syscall);
+         v_syscall = INT2FIX(args.infop.si_syscall);
 #endif
 #ifdef HAVE_ST_SI_NSYSARG
-         v_nsysarg = INT2FIX(infop.si_nsysarg);
+         v_nsysarg = INT2FIX(args.infop.si_nsysarg);
 #endif
 #ifdef HAVE_ST_SI_FAULT
-         v_fault   = INT2FIX(infop.si_fault);
+         v_fault   = INT2FIX(args.infop.si_fault);
 #endif
 #ifdef HAVE_ST_SI_TSTAMP
-         v_time = rb_time_new(infop.si_tstamp.tv_sec,infop.si_tstamp.tv_nsec);
+         v_time = rb_time_new(args.infop.si_tstamp.tv_sec,args.infop.si_tstamp.tv_nsec);
 #endif
       }
 
 #ifdef SIGXRES
       if(sig == SIGXRES){
-         v_entity = INT2FIX(infop.si_entity);
+         v_entity = INT2FIX(args.infop.si_entity);
       }
 #endif
 
       v_last_status = rb_struct_new(v_siginfo_struct,
-         INT2FIX(infop.si_signo),   // Probably SIGCHLD
-         INT2FIX(infop.si_errno),   // 0 means no error
-         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
+         INT2FIX(args.infop.si_signo),   // Probably SIGCHLD
+         INT2FIX(args.infop.si_errno),   // 0 means no error
+         INT2FIX(args.infop.si_code),    // Should be anything but SI_NOINFO
+         INT2FIX(args.infop.si_pid),     // Real PID that sent the signal
+         INT2FIX(args.infop.si_uid),     // Real UID of process that sent signal
          v_utime,
          v_status,
          v_stime,
@@ -566,7 +743,7 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
  * 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
+ * Note that not all platforms (notably Linux) support automatically
  * converting strings to their corresponding signal values, so it is
  * recommended that you always use an array of numeric values.
  *
@@ -600,10 +777,12 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
             if(strlcpy(signame, StringValuePtr(v_val), max) >= max)
                rb_raise(rb_eArgError, "string too large");
 #else
-            if(RSTRING(v_val)->len > max)
+            if(RSTRING_LEN(v_val) >= max)
                rb_raise(rb_eArgError, "string too large");
-            else
-               strncpy(signame, RSTRING(v_val)->ptr, max);
+            else{
+               strncpy(signame, RSTRING_PTR(v_val), max);
+               signame[max-1] = '\0';
+            }
 #endif
 
 #ifdef HAVE_STR2SIG
@@ -619,17 +798,22 @@ static VALUE proc_pause(int argc, VALUE* argv, VALUE mod){
             signum = NUM2INT(v_val);
          }
 
-         memset(&act, 0, sizeof(act));
+         bzero(&act, sizeof(act));
          act.sa_flags = SA_SIGINFO;
          act.sa_sigaction = sigproc;
          res = sigaction(signum, &act, &sa);
 
          if(res)
-          rb_sys_fail("sigaction");
+            rb_sys_fail("sigaction");
       }
    }
 
-   return INT2FIX(pause()); /* Should always be -1 */
+   {
+      struct pause_args pargs;
+      rb_thread_call_without_gvl(pause_without_gvl, &pargs, RUBY_UBF_PROCESS, NULL);
+      RB_GC_GUARD(v_signals);
+      return INT2FIX(pargs.result); /* Should always be -1 */
+   }
 }
 
 /*
@@ -696,8 +880,17 @@ static VALUE proc_sigsend(int argc, VALUE* argv, VALUE mod){
       char signame[SIG2STR_MAX];
       unsigned int max = SIG2STR_MAX;
 
+#ifdef HAVE_STRLCPY
       if(strlcpy(signame, StringValuePtr(v_signal), max) >= max)
         rb_raise(rb_eArgError, "string too large");
+#else
+      if(RSTRING_LEN(v_signal) >= max)
+        rb_raise(rb_eArgError, "string too large");
+      else{
+        strncpy(signame, RSTRING_PTR(v_signal), max);
+        signame[max-1] = '\0';
+      }
+#endif
 
       if(str2sig(signame,&sig) != 0)
         rb_sys_fail("str2sig");
@@ -973,8 +1166,8 @@ void Init_wait3(void)
   rb_define_const(rb_mProcess, "RUSAGE_THREAD", INT2FIX(RUSAGE_THREAD));
 #endif
 
-  /* 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")));
+  /* 2.1.0: The version of the proc-wait3 library */
+  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("2.1.0")));
 
   /* 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.3'
+  spec.version    = '2.1.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
     'source_code_uri'       => 'https://github.com/djberg96/proc-wait3',
     'wiki_uri'              => 'https://github.com/djberg96/proc-wait3/wiki',
     'rubygems_mfa_required' => 'true',
-    'github_repo'           => 'https://github.com/djberg96/proc-wait3'
+    'github_repo'           => 'https://github.com/djberg96/proc-wait3',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

data/spec/proc_wait3_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe Process do
   end
 
   example 'version constant is set to expected value' do
-    expect(Process::WAIT3_VERSION).to eq('1.9.3')
+    expect(Process::WAIT3_VERSION).to eq('2.1.0')
     expect(Process::WAIT3_VERSION).to be_frozen
   end
 

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: proc-wait3
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-05-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,7 +132,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: 
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Adds wait3, wait4 and other methods to the Process module
 test_files:

metadata.gz.sig

@@ -1,3 +1 @@
-�bj<d������&qN�
-�溨}gdԥwf*����J�˚䋓t��!FI��`<�ѝ��Gd9ʦ��<� ���`��,{R�����y�R��#9w̻�
2zk�	T�'@��h�װh��S� �q��_�����v� jљ�J��Y�g2��~C(�>ҵpMNn�f��I��T��dE�פ�SCPn�2h��(�X$��|Rb�n6�9��O��Oȉ^�'
-p���pN���"��n-�M~е:Jc��U��lQ�c���D�z�˾����p�� "$Gu'��w'�[47����q�E�c/�JCh������$��~/��E"[7����R��β�3������Iˍ���9�s�vG��.��8�ZX�ô�B�
+`G��8��x߲���ȱ��r��/��]�@ڱl�'�-N����DFJF�<`��{!(�P�\���l�8;�Z#��z�x�S��L��D<��s��9�gF��I~->��qø-H�{=Q�g