proc-wait3 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bba2d43b0af474f64ee8879055afc649a62afed46269bafc2bea754eb2ab770b
-  data.tar.gz: 0b5e3a6ebc48e370c32273db28e107c068a70e08f367031011bb0c1d1c2065a8
+  metadata.gz: d9ed8e7bd3a3b5631bbb5e2a4d658c60d1876e8880ebc95eab77f920d81b26be
+  data.tar.gz: fa72e2f110aa9a1c4858d7c7a51cc072f115d7de0e63c7f7f0fca0210d26315e
 SHA512:
-  metadata.gz: e31e23649b03fcff7e274634536c6c5924ff9e0cecb52141c34a694c71a3817a00dded441394b9dbd3f7266818c4ec2ca41a41e7b347b63cdad148ab43a7a28b
-  data.tar.gz: 86d669dfe0d6e0dcbe3b136c4b857a52039c53f61de0b0a3cbed9f36bc274ce9c6487136c3e52f112e2f8cd2c2414acae64f239426a69e84a3d976047021e1d2
+  metadata.gz: 027c982ad10f5e7a66bdac1e8406df6f99f4372dd739da56b4a5c05bf9115e58bda7e6fbd5b72a3b6e3734ad652928bb3dbc4750a86a70252abc7541b0792613
+  data.tar.gz: 0b8289e6c28ce586d9a8f932e31b4e7dd39edfc223061a07d85ff8f8a28daf50329df4933079fcf347c592aaf9d9538ee9de78e448022222294b2a2c2ba5b91e

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 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.

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/doc/wait3.md

@@ -216,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/ext/proc/wait3.c

@@ -3,6 +3,7 @@
 #include <ruby/fiber/scheduler.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 /* Debian */
 #ifdef HAVE_SYS_RESOURCE_H
@@ -281,7 +282,14 @@ static VALUE proc_wait3(int argc, VALUE *argv, VALUE mod){
    bzero(&args, sizeof(args));
    args.flags = flags;
 
-   rb_thread_call_without_gvl(wait3_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   /* 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");
@@ -383,7 +391,14 @@ static VALUE proc_wait4(int argc, VALUE *argv, VALUE mod){
    args.pid = pid;
    args.flags = flags;
 
-   rb_thread_call_without_gvl(wait4_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   /* 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");
@@ -491,7 +506,14 @@ static VALUE proc_waitid(int argc, VALUE* argv, VALUE mod){
    args.infop.si_pid = 0;
 #endif
 
-   rb_thread_call_without_gvl(waitid_without_gvl, &args, RUBY_UBF_PROCESS, NULL);
+   /* 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");
@@ -1144,8 +1166,8 @@ void Init_wait3(void)
   rb_define_const(rb_mProcess, "RUSAGE_THREAD", INT2FIX(RUSAGE_THREAD));
 #endif
 
-  /* 2.0.0: The version of the proc-wait3 library */
-  rb_define_const(rb_mProcess, "WAIT3_VERSION", rb_str_freeze(rb_str_new2("2.0.0")));
+  /* 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    = '2.0.0'
+  spec.version    = '2.1.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'

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('2.0.0')
+    expect(Process::WAIT3_VERSION).to eq('2.1.0')
     expect(Process::WAIT3_VERSION).to be_frozen
   end
 

data.tar.gz.sig

@@ -1,4 +1,2 @@
-0��=E!0�9��fL�O r�mv4
-�{��'���)g]�+p-��&��B/pfO�����FN�4l������]�ː��i||�-����N�e��.Ɏ���z�� ��VLf��
-�N�%�����sT��+�9:���El���.jR��W�P+���HŌɳ�y\�y�f�ا4>�C�wr�5ԭ�z�����O�L0X�Vv�Q�����㏅17|����K$�zݵ�3di���*/Q1&��"�R��#�C<Dm�!2ʜ��6�+��h���!�MbG��� ݳ3�
-�?���WLRb�	⦴y<�{������P���i�JwOt����/�7?`S��)�B%$��,�P����5Q%Α-G���ޗ{�cr�
+V�"Ca���M�齭�4�<�١�Q�D���J{����TY�� .[0/$�:�m/�4��?M���<s`N�����:�-D��Rؽ){��j�l�c&$7�d�PQݜV�G��2�m���.��)R��_O�%�;b8?��*�#V�
+�]����}�����9��՞
��%�s��B���M�Q%����rj�N@�8=��p%o{<�!8�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proc-wait3
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Adds wait3, wait4 and other methods to the Process module
 test_files: