cztop-reactor 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ead3b23a272e3e970d8a951b1eb32ee312076363965fb3d423ac81c9eecf4be6
-  data.tar.gz: f9f8024946fee7172468c8716fc87fc3e953e86697f6b568b86f1d08c05306ff
+  metadata.gz: 22ca99dbae54301ef1f95d2eacca5655259668f3a8a7954417d07a18e697ff66
+  data.tar.gz: '0924373dc3ab919d71c9198d96a6bc689136f1c7e9c5c5f5fdade21bdaeff480'
 SHA512:
-  metadata.gz: ce8274021e57515e5dcc260f536fe0c4ac9f3adb0e107dfbd4505e1ce2736c4606690eba22be75dabac5d3a0633cad88071cb23e8eb80dcb1606989e86aeb787
-  data.tar.gz: a9afef7f4b16eab396785f8c541837586a485f9942f0ad9f8f06cb4f14b75a452e32683ca6561df83477cdc065001d85099e5bc0c7cda9c70f8cbb6e6ac35f95
+  metadata.gz: cddbc24432bfe9094e2f445a16a773e0718828fe0d1a9c173292b7a41a96fddaa26de8505208819ab3a498f43446ff53a965a8ce4bbc0bcea5b8d80fa0dd06cc
+  data.tar.gz: a4e834baa6c8d28ea880b93db9823baf3b5eed900b0b61f728be499c9097ef7cb17118faef599d4b0ba6f784937ec16543dd5f6c3427306b93c00407594ecbcb

data/History.md

@@ -1,3 +1,11 @@
+## v0.9.0 [2019-07-10] Michael Granger <ged@FaerieMUD.org>
+
+Improvements
+
+- Fix a bug in signal handling
+- Work around CZTop's mapping of EINTR in a poller_wait to an Interrupt
+
+
 ## v0.8.0 [2019-05-22] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/cztop/reactor.rb

@@ -24,7 +24,7 @@ class CZTop::Reactor
 	include MonitorMixin
 
 	# The version of this library
-	VERSION = '0.8.0'
+	VERSION = '0.9.0'
 
 	# The maximum number of seconds to wait for events when there are no timers
 	# registered.
@@ -36,6 +36,14 @@ class CZTop::Reactor
 		write: CZTop::Poller::ZMQ::POLLOUT,
 	}.freeze
 
+	# Errors encountered during the poll that should retry instead of raising
+	POLLER_RETRY_ERRORS = [
+		Errno::EINTR::Errno, # CZTop maps this to Interrupt, but it can be *any*
+		                     # signal, not just SIGINT
+		Errno::EAGAIN::Errno,
+		Errno::ETIMEDOUT::Errno,
+	]
+
 
 	autoload :Event, 'cztop/reactor/event'
 
@@ -393,7 +401,10 @@ class CZTop::Reactor
 	def wait( timeout=-1 )
 		rc = CZTop::Poller::ZMQ.poller_wait( @poller_ptr, @event_ptr, timeout )
 		if rc == -1
-			if CZMQ::FFI::Errors.errno != Errno::ETIMEDOUT::Errno
+			case CZMQ::FFI::Errors.errno
+			when *POLLER_RETRY_ERRORS
+				# Retry if the error means we should
+			else
 				CZTop::HasFFIDelegate.raise_zmq_err
 			end
 			return nil

data/lib/cztop/reactor/signal_handling.rb

@@ -118,7 +118,8 @@ module CZTop::Reactor::SignalHandling
 
 
 	### Look for any signals that arrived and handle them.
-	def handle_queued_signals( _event )
+	def handle_queued_signals( event )
+		event.socket.wait
 		while sig = Thread.main[ SIGNAL_QUEUE_KEY ].shift
 			self.log.debug "  got a queued signal: %p" % [ sig ]
 			self.handle_signal( sig )

data/spec/cztop/reactor_spec.rb

@@ -364,6 +364,16 @@ describe CZTop::Reactor do
 		end
 
 
+		it "ignores EINTR by default" do
+			expect( CZTop::Poller::ZMQ ).to receive( :poller_wait ).
+				and_return( -1 )
+			expect( CZMQ::FFI::Errors ).to receive( :errno ).
+				and_return( Errno::EINTR::Errno )
+
+			expect( reactor.poll_once ).to be_nil
+		end
+
+
 		it "has an option to propagate EGAIN/EWOULDBLOCK" do
 			expect( CZTop::Poller::ZMQ ).to receive( :poller_wait ).
 				and_raise( Errno::EAGAIN.new )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cztop-reactor
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
   JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
   -----END CERTIFICATE-----
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
 description: |-
   This is an implementation of the Reactor pattern described in [Pattern-Oriented
   Software Architecture (Volume 2)][POSA2]. It allows an asynchronous application
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This is an implementation of the Reactor pattern described in [Pattern-Oriented