cztop 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8b5fa8bb96e24ab3c500b704891677ab4431b66f027cfd68dd15d7be79a380
-  data.tar.gz: c6360aaef9640bf4f7f75bf3f7f2229d48c93b9e5929bdb28c5012fb9a014806
+  metadata.gz: ee0da7ba06a375442f26d2838664bef2e2546bc5b99f7515dbfbb560e8755dd8
+  data.tar.gz: 804736cdfa21a4907be8b9f7dbb3109b3a80e83735502906696454b6f10b0822
 SHA512:
-  metadata.gz: b099c61bbfde6095eaf621b09f13501e2529f87fd91850863b4bdb30d4856584908fc06712371db6f767bf2061f9752cb26991b185e9dd8ab212d686911747fd
-  data.tar.gz: 0731e75df8e20bbfb12546ef2145811104dc117eb381b65edbe1733cf147b4785bcc96679a372f3029351da338872c915f7d801f7031f5302ad52196fec056a7
+  metadata.gz: 4b058fc7d52d523028246130134af420161b7a352d7b9d7597482204d2211ab3d0ef75ae47056ba75e237c3dde2150f8df42a929250b55202161a6ca638f6999
+  data.tar.gz: 335d9cb39d1bb7a47aa62965145aa692507c1fa42290cec830657dc333f6909c138535f22d7f4ad2d7c40b8bca7d1c334e2a9f553ee0af881f7c9f6686663312

data/CHANGES.md

@@ -1,3 +1,8 @@
+1.2.7 (7/12/2024)
+-----
+* CZTop::Socket#wait_readable: honor small (< 0.5s) timeouts
+* CZTop::Socket#wait_writable: honor small (< 0.5s) timeouts
+
 1.2.6 (7/12/2024)
 -----
 * add missing `require 'io/wait'` to get `IO#wait_readable`

data/lib/cztop/send_receive_methods.rb

@@ -48,15 +48,29 @@ module CZTop
 
 
     # Because ZMQ sockets are edge-triggered, there's a small chance that we miss an edge (race condition). To avoid
-    # blocking forever, all waiting on the ZMQ FD is done with this timeout.
+    # blocking forever, all waiting on the ZMQ FD is done with this timeout or less.
+    #
+    # The race condition exists between the calls to {#readable?}/{#writable?} and waiting for the ZMQ FD. If the
+    # socke becomes readable/writable during that time, waiting for the FD could block forever without a timeout.
+    #
     FD_TIMEOUT = 0.5
 
 
     # @note Only available on Ruby >= 3.2
     #
-    def wait_for_fd_signal
+    def wait_for_fd_signal(timeout = nil)
       @fd_io ||= to_io
-      @fd_io.wait_readable FD_TIMEOUT # NOTE: always wait for readability on ZMQ FD
+
+      if timeout
+        if timeout > FD_TIMEOUT
+          timeout = FD_TIMEOUT
+        end
+      else
+        timeout = FD_TIMEOUT
+      end
+
+      # NOTE: always wait for readability on ZMQ FD
+      @fd_io.wait_readable timeout
     end if IO.method_defined?(:wait_readable)
 
 
@@ -80,7 +94,7 @@ module CZTop
       while true
         # p wait_readable: self, timeout: timeout
 
-        wait_for_fd_signal
+        wait_for_fd_signal timeout
         break if readable? # NOTE: ZMQ FD can't be trusted
         raise ::IO::TimeoutError if timeout_at && now >= timeout_at
 
@@ -107,7 +121,7 @@ module CZTop
       while true
         # p wait_writable: self, timeout: timeout
 
-        wait_for_fd_signal
+        wait_for_fd_signal timeout
         break if writable? # NOTE: ZMQ FD can't be trusted
         raise ::IO::TimeoutError if timeout_at && now >= timeout_at
 

data/lib/cztop/version.rb

@@ -2,6 +2,6 @@
 
 module CZTop
 
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Patrik Wenger