cztop-reactor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7040196abcd091e72df775bcb4c4dc6ebca8781c
-  data.tar.gz: 3da1c1b5f4ef14d63d2ef16d502c10de3cf8a0e7
+SHA256:
+  metadata.gz: ebc72ede3239718ff03c2c29509a494c993d2d115bf07b4c3d5d748ea4f20ae6
+  data.tar.gz: 77596ee72fc148492039318ee36ba075152b96a963421d458c88df884b0d267f
 SHA512:
-  metadata.gz: 2b7ccd0a2736e3cfc0af5408c1ee804ac1163c5f2ea730f9f21a3a6a5c17c71aa46784585d133cc510d3d85e07ad764b397f440bfb98c1f79c55abea6ec5dbf9
-  data.tar.gz: '0845fbba1711499f0bee3caf9c09a893c9e0d4395cdb24f943bcded4113d8dade8c9cdd153ff979a7b4b19fb8ef709d8eef42f03e3320b10deb1c6399196afab'
+  metadata.gz: 0b2bf31a6cf841f39395dc04aa25ca80a0dbbbeddc267393410f77e072671c817c4e4d82dd0429e9869c1bf67c7f7f0dc91ab121cc2f66d5614727c6c56645fc
+  data.tar.gz: 470fca566a0285487be7ad4dbe6b3bdb40a8c61cb64c01b11d28b86e70bed17da5052efad30185216c9273a7fcc0afcaed4cfeb62aba99c67c164cbfcdb4cc6b

data/ChangeLog

@@ -1,9 +1,23 @@
+2017-05-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.3.0 for changeset 93726ed1d11c
+	[4a5ff1ab5370] [tip]
+
+	* .hgsigs:
+	Added signature for changeset b27d8748d922
+	[93726ed1d11c] [v0.3.0]
+
+	* History.md, lib/cztop/reactor.rb:
+	Bumped the minor version, updated history.
+	[b27d8748d922]
+
 2017-05-15  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Manifest.txt, lib/cztop/reactor/signal_handling.rb,
 	spec/cztop/reactor/signal_handling_spec.rb:
 	Add a mixin for signal handling.
-	[970a2eb110fb] [tip]
+	[970a2eb110fb]
 
 2017-04-30  Michael Granger  <ged@FaerieMUD.org>
 

data/History.md

@@ -1,3 +1,11 @@
+## v0.4.0 [2018-06-27] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Make the reactor threadsafe
+- Guard against events with no sockets
+
+
 ##  v0.3.0 [2017-05-15] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Rakefile

@@ -54,6 +54,7 @@ task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
 task :test => :spec
 
 # Rebuild the ChangeLog immediately before release
+file 'ChangeLog'
 task :prerelease => 'ChangeLog'
 CLOBBER.include( 'ChangeLog' )
 
@@ -81,8 +82,10 @@ if File.directory?( '.hg' )
 	end
 end
 
+file 'Manifest.txt'
+
 task :gemspec => GEMSPEC
-file GEMSPEC => __FILE__
+file GEMSPEC => [ 'Manifest.txt', 'ChangeLog', __FILE__ ]
 task GEMSPEC do |task|
 	spec = $hoespec.spec
 	spec.files.delete( '.gemtest' )

data/lib/cztop/reactor.rb

@@ -4,6 +4,7 @@
 require 'loggability'
 require 'timers'
 require 'ffi'
+require 'monitor'
 
 require 'cztop'
 require 'cztop/poller'
@@ -20,9 +21,10 @@ require 'cztop/has_ffi_delegate'
 #
 class CZTop::Reactor
 	extend Loggability
+	include MonitorMixin
 
 	# The version of this library
-	VERSION = '0.3.0'
+	VERSION = '0.4.0'
 
 	# The maximum number of seconds to wait for events when there are no timers
 	# registered.
@@ -63,6 +65,8 @@ class CZTop::Reactor
 			CZTop::Poller::ZMQ.poller_destroy( ptr_ptr )
 		})
 		@event_ptr = ::FFI::MemoryPointer.new( CZTop::Poller::ZMQ::PollerEvent )
+
+		super
 	end
 
 
@@ -107,18 +111,20 @@ class CZTop::Reactor
 
 		raise LocalJumpError, "no block or handler given" unless handler
 
-		self.unregister( socket )
+		self.synchronize do
+			self.unregister( socket )
 
-		ptr = self.ptr_for_socket( socket )
-		rc = CZTop::Poller::ZMQ.poller_add( @poller_ptr, ptr, nil, 0 )
-		self.log.debug "poller_add: rc = %p" % [ rc ]
-		CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
+			ptr = self.ptr_for_socket( socket )
+			rc = CZTop::Poller::ZMQ.poller_add( @poller_ptr, ptr, nil, 0 )
+			self.log.debug "poller_add: rc = %p" % [ rc ]
+			CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
 
-		self.log.info "Registered: %p with handler: %p" % [ socket, handler ]
-		self.sockets[ socket ][ :handler ] = handler
-		self.enable_events( socket, *events )
+			self.log.info "Registered: %p with handler: %p" % [ socket, handler ]
+			self.sockets[ socket ][ :handler ] = handler
+			self.enable_events( socket, *events )
 
-		@socket_pointers[ ptr.to_i ] = socket
+			@socket_pointers[ ptr.to_i ] = socket
+		end
 	end
 	alias_method :add, :register
 	alias_method :register_socket, :register
@@ -128,15 +134,17 @@ class CZTop::Reactor
 	### handles, if present. Returns the handle if it was registered, or
 	### <tt>nil</tt> if it was not.
 	def unregister( socket )
-		if self.sockets.delete( socket )
-			self.log.info "Unregistering: %p" % [ socket ]
-			ptr = self.ptr_for_socket( socket )
-			rc = CZTop::Poller::ZMQ.poller_remove( @poller_ptr, ptr )
-			self.log.debug "poller_remove: rc = %p" % [ rc ]
-			CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
-		end
+		self.synchronize do
+			if self.sockets.delete( socket )
+				self.log.info "Unregistering: %p" % [ socket ]
+				ptr = self.ptr_for_socket( socket )
+				rc = CZTop::Poller::ZMQ.poller_remove( @poller_ptr, ptr )
+				self.log.debug "poller_remove: rc = %p" % [ rc ]
+				CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
+			end
 
-		@socket_pointers.delete( ptr.to_i )
+			@socket_pointers.delete( ptr.to_i )
+		end
 	end
 	alias_method :remove, :unregister
 	alias_method :unregister_socket, :unregister
@@ -156,12 +164,14 @@ class CZTop::Reactor
 			raise ArgumentError, "invalid events: %p" % [ invalid ]
 		end
 
-		socket = self.socket_for_ptr( socket ) if socket.is_a?( FFI::Pointer )
-		raise ArgumentError, "%p is not registered yet" % [ socket ] unless
-			self.registered?( socket )
+		self.synchronize do
+			socket = self.socket_for_ptr( socket ) if socket.is_a?( FFI::Pointer )
+			raise ArgumentError, "%p is not registered yet" % [ socket ] unless
+				self.registered?( socket )
 
-		self.sockets[ socket ][ :events ] |= events
-		self.update_poller_for( socket )
+			self.sockets[ socket ][ :events ] |= events
+			self.update_poller_for( socket )
+		end
 	end
 	alias_method :enable_event, :enable_events
 	alias_method :enable_socket_events, :enable_events
@@ -171,9 +181,11 @@ class CZTop::Reactor
 	### Remove the specified +events+ from the list that will be polled for on
 	### the given +socket+ handle.
 	def disable_events( socket, *events )
-		socket = self.socket_for_ptr( socket ) if socket.is_a?( FFI::Pointer )
-		self.sockets[ socket ][:events] -= events
-		self.update_poller_for( socket )
+		self.synchronize do
+			socket = self.socket_for_ptr( socket ) if socket.is_a?( FFI::Pointer )
+			self.sockets[ socket ][:events] -= events
+			self.update_poller_for( socket )
+		end
 	end
 	alias_method :disable_socket_events, :disable_events
 
@@ -197,9 +209,11 @@ class CZTop::Reactor
 
 	### Clear all registered sockets and returns the sockets that were cleared.
 	def clear
-		sockets = self.sockets.keys
-		sockets.each {|sock| self.unregister(sock) }
-		return sockets
+		self.synchronize do
+			sockets = self.sockets.keys
+			sockets.each {|sock| self.unregister(sock) }
+			return sockets
+		end
 	end
 
 
@@ -348,11 +362,13 @@ class CZTop::Reactor
 	### Modify the underlying poller's event mask with the events +socket+ is
 	### interested in.
 	def update_poller_for( socket )
-		event_mask = self.mask_for( socket )
+		self.synchronize do
+			event_mask = self.mask_for( socket )
 
-		ptr = self.ptr_for_socket( socket )
-		rc = CZTop::Poller::ZMQ.poller_modify( @poller_ptr, ptr, event_mask )
-		CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
+			ptr = self.ptr_for_socket( socket )
+			rc = CZTop::Poller::ZMQ.poller_modify( @poller_ptr, ptr, event_mask )
+			CZTop::HasFFIDelegate.raise_zmq_err if rc == -1
+		end
 	end
 
 

data/lib/cztop/reactor/signal_handling.rb

@@ -14,7 +14,7 @@ require 'cztop/reactor' unless defined?( CZTop::Reactor )
 #     require 'cztop/reactor/signal_handling'
 #
 #     class MyDaemon
-#         include 'cztop/reactor/signal_handling'
+#         include CZTop::Reactor::SignalHandling
 #
 #         def start
 #             @reactor = CZTop::Reactor.new
@@ -133,7 +133,7 @@ module CZTop::Reactor::SignalHandling
 
 	### Set up signal traps for the specified +signals+.
 	def set_signal_traps( *signals )
-		self.log.debug "Setting up deferred signal handlers."
+		self.log.debug "Setting up deferred signal handlers for signals: %p." % [ signals ]
 		signals.each do |sig|
 			Signal.trap( sig ) do
 				Thread.main[ SIGNAL_QUEUE_KEY ] << sig

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cztop-reactor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
   83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -25,17 +25,17 @@ cert_chain:
   /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
   BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
   MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   This is an implementation of the Reactor pattern described in [Pattern-Oriented
   Software Architecture (Volume 2)][POSA2]. It allows an asynchronous application
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This is an implementation of the Reactor pattern described in [Pattern-Oriented