zmqmachine 0.3.1 → 0.3.2

data/History.txt

@@ -1,7 +1,19 @@
+== 0.3.2 / 2010-08-25
+  * Fixed a bug in Timers where the timers were never getting removed
+    after they fired. Bug was caused by a Ruby bug with #delete_if. While
+    deleting each fired timer, the delete_if loop was exited early via
+    a call to #break as an optimization. The #break caused all deletes to
+    be ignored.
+    See bug http://redmine.ruby-lang.org/issues/show/2545
+  * Minor fixes to the ping-pong examples. Was missing some calls to
+    register/deregister for read/write events. The socket semantics have
+    changed since earlier revisions; those changes didn't get caught until
+    now.
+
 == 0.3.1 / 2010-08-16
   * Forgot to load the xreq/xrep files during startup
   * Added support for resetting a timer's firing schedule. Useful for when
-    the time source has been overridden; let's existing timers 
+    the time source has been overridden; let's existing timers
     reschedule themselves using the new time source.
   * Fixed a logic bug with delivery of multi-part messages
 
@@ -19,7 +31,7 @@
 == 0.2.0 / 2010-06-06
   * Updated internals to conform to the 0mq api as of
   release 2.0.7.
-  
+
   * Minor api enhancements.
 
 == 0.1.0 / 2010-06-02

data/examples/one_handed_ping_pong.rb

@@ -35,7 +35,7 @@ class PingPongHandler
   def on_writable socket
     rc = socket.send_message_string "#{'a' * 2048}"
     @sent_count += 1
-    
+
     # after sending the first message, deregister for future write events
     @context.deregister_writable socket
   end
@@ -71,7 +71,7 @@ ctx1 = ZM::Reactor.new(:test).run do |context|
   end
 end
 
-ctx1.join
+ctx1.join 15_000
 #puts "Started at [#{Time.now}]"
 #puts "main thread will sleep [#{sleep_time}] seconds before aborting the context threads"
 #sleep sleep_time

data/examples/ping_pong.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'ffi-rzmq'
 require '../lib/zmqmachine'
 
-# This example illustrates how to write a simple set of 
+# This example illustrates how to write a simple set of
 # handlers for providing message ping-pong using
 # a REQ/REP socket pair. All activity is asynchronous and
 # relies on non-blocking I/O.
@@ -30,7 +30,7 @@ class PongHandler
     @received_count += 1
     socket.send_message messages.first
     @sent_count += 1
-    
+
     @context.next_tick { @context.stop } if @sent_count == Allowed_pongs
   end
 end
@@ -45,6 +45,7 @@ class PingHandler
   end
 
   def on_attach socket
+    @context.register_readable socket
     address = ZM::Address.new '127.0.0.1', 5555, :tcp
     rc = socket.connect address
     rc = socket.send_message_string "#{'a' * 2048}"
@@ -81,6 +82,6 @@ end
 #end
 
 
-ctx1.join
+ctx1.join 15_000
 #ctx2.join
 puts "received [#{@pong_handler.received_count}], sent [#{@pong_handler.sent_count}]"

data/examples/pubsub_forwarder.rb

@@ -0,0 +1,141 @@
+
+require 'rubygems'
+require 'ffi-rzmq'
+require '../lib/zmqmachine'
+
+
+# Shows how to publish from multiple PUB sockets to the same
+# "bus" via a forwarder device.
+#
+
+class PublisherHandler
+  attr_reader :sent_count
+
+  def initialize context, port, topics
+    @context = context
+    @port = port
+    @topics = topics
+    @sent_count = 0
+  end
+
+  def on_attach socket
+    address = ZM::Address.new '127.0.0.1', @port, :tcp
+    rc = socket.connect address
+#    puts "publisher on_attach rc [#{rc}]"
+  end
+
+  def on_writable socket
+#    puts "publisher writing..."
+    topic = @topics[rand(@topics.size)]
+    symbol = topic.split('.').first
+
+    if 'es' == symbol
+      payload = "#{topic}|#{rand(1200) + 1}|#{rand(4400)}"
+    else
+      payload = "#{topic}|#{rand(300) + 1}|#{rand(8000)}"
+    end
+
+    message = ZMQ::Message.new payload
+    socket.send_message message
+    @sent_count += 1
+  end
+end
+
+class SubscriberHandler
+  attr_reader :received_count, :topics
+
+  def initialize context, ports, topic = nil, sleep = false
+    @context = context
+    @received_count = 0
+    @ports = ports
+    (@topics ||= []) << topic.to_s
+    @sleep = sleep
+  end
+
+  def on_attach socket
+    @ports.each do |port|
+      address = ZM::Address.new '127.0.0.1', port, :tcp
+      rc = socket.connect address
+#      puts "subscriber on_attach rc [#{rc}]"
+
+      @topics.each do |topic|
+        puts "subscribe to [#{topic}]"
+        socket.subscribe topic
+      end
+    end
+  end
+
+  def on_readable socket, messages
+    @received_count += 1
+    sleep 0.01 if @sleep
+  end
+end
+
+sleep_time = 5
+
+
+# Run the forwarder device in a separate context. *Could* be run from
+# the same context as the publishers and subscribers too.
+#
+ctx1 = ZM::Reactor.new(:A).run do |context|
+  incoming = ZM::Address.new '127.0.0.1', 5555, :tcp
+  outgoing = "tcp://127.0.0.1:5556"
+
+  forwarder = ZM::Device::Forwarder.new context, incoming, outgoing
+  puts "forwarder started"
+
+#  context.oneshot_timer(3000) do
+#    puts "reactor one shutting down..."
+#    context.stop
+#    puts "reactor one shut down"
+#  end
+end
+
+# Or, run each handler in separate contexts each with its
+# own thread.
+ctx2 = ZM::Reactor.new(:B).run do |context|
+  # start the publishers and subscribers after a 1 sec delay; give time
+  # to the forwarder device to start up and get ready
+  context.oneshot_timer(1000) do
+    @pub1_handler = PublisherHandler.new context, 5555, ['futures.us.es.m.10', 'futures.us.es.u.10']
+    context.pub_socket @pub1_handler
+
+    @pub2_handler = PublisherHandler.new context, 5555, ['futures.us.nq.m.10', 'futures.us.nq.u.10']
+    context.pub_socket @pub2_handler
+
+    @sub1_handler = SubscriberHandler.new context, [5556]
+    context.sub_socket @sub1_handler
+
+    @sub2_handler = SubscriberHandler.new context, [5556], 'futures.us.es.m'
+    context.sub_socket @sub2_handler
+
+    @sub3_handler = SubscriberHandler.new context, [5556], 'futures.us.es.u'
+    context.sub_socket @sub3_handler
+
+    @sub4_handler = SubscriberHandler.new context, [5556], 'futures.us.nq.m'
+    context.sub_socket @sub4_handler
+
+    @sub5_handler = SubscriberHandler.new context, [5556], 'futures.us.'
+    context.sub_socket @sub5_handler
+  end
+
+#  context.oneshot_timer(sleep_time * 1000) do
+#    puts "reactor two shutting down..."
+#    context.stop
+#    puts "reactor two shut down"
+#  end
+end
+
+# let's see how many messages we can publish in this many seconds
+puts "Started at [#{Time.now}]"
+puts "main thread will sleep [#{sleep_time}] seconds before aborting the reactor context threads"
+sleep sleep_time
+
+puts "done sleeping"
+puts "sent [#{@pub1_handler.sent_count}]"
+puts "sent [#{@pub2_handler.sent_count}]"
+puts "*               [#{@sub1_handler.received_count}]"
+puts "futures.us.ep.m [#{@sub2_handler.received_count}]"
+puts "futures.us.ep.u [#{@sub3_handler.received_count}]"
+puts "futures.us.nq.m [#{@sub4_handler.received_count}]"
+puts "futures.us.nq   [#{@sub5_handler.received_count}]"

data/lib/zm/address.rb

@@ -3,14 +3,14 @@
 # Author:: Chuck Remes
 # Homepage::  http://github.com/chuckremes/zmqmachine
 # Date:: 20100602
-# 
+#
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2010 by Chuck Remes. All Rights Reserved.
 # Email: cremes at mac dot com
-# 
+#
 # (The MIT License)
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # 'Software'), to deal in the Software without restriction, including
@@ -18,10 +18,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -32,7 +32,7 @@
 #
 #---------------------------------------------------------------------------
 #
-# 
+#
 
 module ZMQMachine
 
@@ -41,18 +41,34 @@ module ZMQMachine
   #
   class Address
     attr_reader :host, :port, :transport
-    
+
     # +type+ : :tcp, :pgm or :inprocess
     def initialize host, port, type = :tcp
       @host = host
       @port = port
       @transport = determine_type type
     end
-    
+
     def to_s
       "#{@transport}://#{@host}:#{@port}"
     end
 
+
+    # Converts strings with the format "type://host:port" into
+    # an Address instance.
+    #
+    def self.from_string string
+      #FIXME: needs error checking and ability to handle inproc/ipc types
+      #
+      # should also return nil or some other error indication when parsing fails
+      split = string.split(':')
+      type = split[0]
+      port = split[2]
+      host = split[1].sub('//', '')
+
+      Address.new host, port, type.to_sym
+    end
+
     private
 
     def determine_type type

data/lib/zm/devices/forwarder.rb

@@ -0,0 +1,119 @@
+#--
+#
+# Author:: Chuck Remes
+# Homepage::  http://github.com/chuckremes/zmqmachine
+# Date:: 20100823
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2010 by Chuck Remes. All Rights Reserved.
+# Email: cremes at mac dot com
+#
+# (The MIT License)
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#---------------------------------------------------------------------------
+#
+#
+
+module ZMQMachine
+
+  module Device
+
+
+    # Used in conjunction with PUB/SUB sockets to allow multiple publishers to
+    # all publish to the same "bus."
+    #
+    # The basic mechanics are that the program contains 1 (or more) publishers that
+    # broadcast to the same bus. Connecting to
+    # an intermediate queue device allows for the publishers to have all of their
+    # traffic aggregated to a single port.
+    #
+    # Example:
+    #
+    #  # the queue creates sockets and binds to both given addresses; all messages get
+    #  # republished from +incoming+ to +outgoing+
+    #  forwarder = ZM::Device::Forwarder.new reactor, "tcp://192.168.0.100:5050", "tcp://192.168.0.100:5051"
+    #
+    #  # the +pub_handler+ internally calls "connect" to the incoming address given above
+    #  pub1 = reactor.pub_socket pub_handler
+    #  pub2 = reactor.pub_socket pub_handler
+    #
+    #  # the +sub_handler+ internally calls "connect" to the outgoing address given above
+    #  subscriber = reactor.sub_socket sub_handler
+    #
+    class Forwarder
+
+      class Handler
+        attr_accessor :socket_out
+
+        def initialize reactor, address, debug = false
+          @reactor = reactor
+          @address = address
+          @debug = debug
+        end
+
+        def on_attach socket
+          socket.identity = "forwarder.#{Kernel.rand(999_999_999)}"
+          rc = socket.bind @address
+          #FIXME: error handling!
+
+          socket.subscribe_all if :sub == socket.kind
+        end
+
+        def on_writable socket
+          @reactor.deregister_writable socket
+        end
+
+        def on_readable socket, messages
+          messages.each { |msg| p msg.copy_out_string } if @debug
+
+          socket_out.send_messages messages if @socket_out
+        end
+      end # class Handler
+
+
+      # Takes either a properly formatted string that can be converted into a ZM::Address
+      # or takes a ZM::Address directly.
+      #
+      # Forwards all messages received by the +incoming+ address to the +outgoing+ address.
+      #
+      def initialize reactor, incoming, outgoing, debug = false
+        incoming = Address.from_string incoming if incoming.kind_of? String
+        outgoing = Address.from_string outgoing if outgoing.kind_of? String
+
+        # setup the handlers for processing messages
+        @handler_in = Handler.new reactor, incoming, debug
+        @handler_out = Handler.new reactor, outgoing, debug
+
+        # create each socket and pass in the appropriate handler
+        @incoming = reactor.sub_socket @handler_in
+        @outgoing = reactor.pub_socket @handler_out
+
+        # set each handler's outgoing socket
+        @handler_in.socket_out = @outgoing
+        @handler_out.socket_out = @incoming
+      end
+    end # class Forwarder
+
+  end # module Device
+
+end # module ZMQMachine

data/lib/zm/devices/queue.rb

@@ -0,0 +1,122 @@
+#--
+#
+# Author:: Chuck Remes
+# Homepage::  http://github.com/chuckremes/zmqmachine
+# Date:: 20100823
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2010 by Chuck Remes. All Rights Reserved.
+# Email: cremes at mac dot com
+#
+# (The MIT License)
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#---------------------------------------------------------------------------
+#
+#
+
+module ZMQMachine
+
+  module Device
+
+
+    # Used in conjunction with REQ/REP sockets to load balance the requests and
+    # replies over (potentially) multiple backends.
+    #
+    # The basic mechanics are that the program contains 1 (or more) clients that
+    # talk to 1 (or more) backends that all perform the same work. Connecting to
+    # an intermediate queue device allows for the client requests to be fair-balanced
+    # among the available backend servers. The hidden identities passed along by
+    # REQ/REP sockets are used by the queue device's internal XREQ/XREP sockets to
+    # route the messages back to the appropriate client.
+    #
+    # Example:
+    #
+    #  # the queue creates sockets and binds to both given addresses; all messages get
+    #  # routed between the two
+    #  queue = ZM::Device::Queue.new reactor, "tcp://192.168.0.100:5050", "tcp://192.168.0.100:5051"
+    #
+    #  # the +client_handler+ internally calls "connect" to the incoming address given above
+    #  client = reactor.req_socket client_handler
+    #  client2 = reactor.req_socket client_handler
+    #
+    #  # the +server_handler+ internally calls "connect" to the outgoing address given above
+    #  server = reactor.rep_socket server_handler
+    #
+    class Queue
+
+      class Handler
+        attr_accessor :socket_out
+
+        def initialize reactor, address, debug = false, dir = 0
+          @reactor = reactor
+          @address = address
+          @debug = debug
+          @dir = dir
+        end
+
+        def on_attach socket
+          socket.identity = "queue.#{Kernel.rand(999_999_999)}"
+          rc = socket.bind @address
+          #FIXME: error handling!
+        end
+
+        def on_writable socket
+          @reactor.deregister_writable socket
+        end
+
+        def on_readable socket, messages
+          messages.each { |msg| puts "[#{@dir}] [#{msg.copy_out_string}]" } if @debug
+
+          if @socket_out
+            socket_out.send_messages messages
+          end
+        end
+      end # class Handler
+
+
+      # Takes either a properly formatted string that can be converted into a ZM::Address
+      # or takes a ZM::Address directly.
+      #
+      # Routes all messages received by either address to the other address.
+      #
+      def initialize reactor, incoming, outgoing, debug = false
+        incoming = Address.from_string incoming if incoming.kind_of? String
+        outgoing = Address.from_string outgoing if outgoing.kind_of? String
+
+        # setup the handlers for processing messages
+        @handler_in = Handler.new reactor, incoming, debug, :in
+        @handler_out = Handler.new reactor, outgoing, debug, :out
+
+        # create each socket and pass in the appropriate handler
+        @incoming = reactor.xrep_socket @handler_in
+        @outgoing = reactor.xreq_socket @handler_out
+
+        # set each handler's outgoing socket
+        @handler_in.socket_out = @outgoing
+        @handler_out.socket_out = @incoming
+      end
+    end # class Queue
+
+  end # module Device
+
+end # module ZMQMachine

data/lib/zm/devices.rb

@@ -0,0 +1,4 @@
+
+%w( forwarder queue ).each do |rb_file|
+  require File.join(File.dirname(__FILE__), 'devices', rb_file)
+end

data/lib/zm/reactor.rb

@@ -332,7 +332,7 @@ module ZMQMachine
     def cancel_timer timer
       @timers.cancel timer
     end
-    
+
     # Asks all timers to reschedule themselves starting from Timers.now.
     # Typically called when the underlying time source for the ZM::Timers
     # class has been replaced; existing timers may not fire as expected, so

data/lib/zm/sockets/base.rb

@@ -117,9 +117,9 @@ module ZMQMachine
         queued = @raw_socket.send_string message, ZMQ::NOBLOCK | (multipart ? ZMQ::SNDMORE : 0)
         queued
       end
-      
+
       # Convenience method for sending a multi-part message. The
-      # +messages+ argument must respond to :size and :at (like
+      # +messages+ argument must respond to :size, :at and :last (like
       # an Array).
       #
       # May raise a ZMQ::SocketError.
@@ -128,16 +128,16 @@ module ZMQMachine
         rc = false
         i = 0
         size = messages.size
-       
+
         # loop through all messages but the last
         while size > 1 && i < size - 1 do
           rc = send_message messages.at(i), true
           i += 1
         end
-        
+
         # send the last message without the multipart arg to flush
         # the message to the 0mq queue
-        rc = send_messages.last if size > 0
+        rc = send_message messages.last if size > 0
         rc
       end
 

data/lib/zm/sockets/sub.rb

@@ -3,14 +3,14 @@
 # Author:: Chuck Remes
 # Homepage::  http://github.com/chuckremes/zmqmachine
 # Date:: 20100602
-# 
+#
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2010 by Chuck Remes. All Rights Reserved.
 # Email: cremes at mac dot com
-# 
+#
 # (The MIT License)
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # 'Software'), to deal in the Software without restriction, including
@@ -18,10 +18,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -32,7 +32,7 @@
 #
 #---------------------------------------------------------------------------
 #
-# 
+#
 
 module ZMQMachine
 
@@ -71,6 +71,10 @@ module ZMQMachine
         @raw_socket.setsockopt ZMQ::SUBSCRIBE, topic
       end
 
+      def subscribe_all
+        subscribe ''
+      end
+
       private
 
       def allocate_socket context

data/lib/zm/timers.rb

@@ -3,14 +3,14 @@
 # Author:: Chuck Remes
 # Homepage::  http://github.com/chuckremes/zmqmachine
 # Date:: 20100602
-# 
+#
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2010 by Chuck Remes. All Rights Reserved.
 # Email: cremes at mac dot com
-# 
+#
 # (The MIT License)
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # 'Software'), to deal in the Software without restriction, including
@@ -18,10 +18,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -32,12 +32,12 @@
 #
 #---------------------------------------------------------------------------
 #
-# 
+#
 
 module ZMQMachine
 
   # Manages the addition and cancellation of all timers. Each #Reactor
-  # maintains its own set of timers; the timer belongs to the 
+  # maintains its own set of timers; the timer belongs to the
   # reactor context.
   #
   # This should never be instantiated directly
@@ -83,7 +83,7 @@ module ZMQMachine
       timer
     end
 
-    # Cancel the +timer+. 
+    # Cancel the +timer+.
     #
     # Returns +true+ when cancellation succeeds.
     # Returns +false+ when it fails to find the
@@ -94,7 +94,7 @@ module ZMQMachine
     end
 
     # A convenience method that loops through all known timers
-    # and fires all of the expired timers. 
+    # and fires all of the expired timers.
     #
     #--
     # Internally the list is sorted whenever a timer is added or
@@ -106,35 +106,42 @@ module ZMQMachine
       # all time is expected as milliseconds
       now = Timers.now
       save = []
+      delete = []
 
       # timers should be sorted by expiration time
-      @timers.delete_if do |timer|
+      # NOTE: was using #delete_if here, but it does *not* delete any
+      # items when the break executes before iterating through the entire
+      # set; that's unacceptable so I save each timer for deletion and
+      # do that in a separate loop
+      @timers.each do |timer|
         break unless timer.expired?(now)
         timer.fire
         save << timer if timer.periodical?
-        true
+        delete << timer
       end
 
+      delete.each { |timer| @timers.delete timer }
+
       # reinstate the periodicals; necessary to do in two steps
       # since changing the timer.fire_time inside the loop would
       # not retain proper ordering in the sorted set; re-adding it
-      # ensures the timer is in sorted order
+      # ensures the timers are in sorted order
       save.each { |timer| @timers.add timer }
     end
-    
+
     # Runs through all timers and asks each one to reschedule itself
     # from Timers.now + whatever delay was originally recorded.
     #
     def reschedule
       timers = @timers.dup
       @timers.clear
-      
+
       timers.each do |timer|
         timer.reschedule
         @timers.add timer
       end
     end
-    
+
     # Returns the current time using the following algo:
     #
     #  (Time.now.to_f * 1000).to_i
@@ -147,7 +154,7 @@ module ZMQMachine
     def self.now
       (Time.now.to_f * 1000).to_i
     end
-    
+
     # Convert Timers.now to a number usable by the Time class.
     #
     def self.now_converted
@@ -157,7 +164,7 @@ module ZMQMachine
 
 
   # Used to track the specific expiration time and execution
-  # code for each timer. 
+  # code for each timer.
   #
   # This should never be instantiated directly
   # by user code. A timer must be known to the #Reactor in which it
@@ -214,7 +221,7 @@ module ZMQMachine
     def periodical?
       @periodical
     end
-    
+
     def reschedule
       schedule_firing_time
     end
@@ -234,7 +241,7 @@ module ZMQMachine
     # had it not been late, it would fire at 20
     def schedule_firing_time
       @initiated = Timers.now
-      
+
       @fire_time = @initiated + @delay
     end
 

data/lib/zmqmachine.rb

@@ -66,7 +66,7 @@ require 'set'
 require 'ffi-rzmq'
 
 # the order of files is important
-%w(address exceptions timers deferrable reactor message sockets).each do |file|
+%w(address exceptions timers deferrable reactor message sockets devices).each do |file|
   require ZMQMachine.libpath(['zm', file])
 end
 

data/version.txt

@@ -1 +1 @@
-0.3.1
+0.3.2

data/zmqmachine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmqmachine}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-25}
   s.description = %q{ZMQMachine is another Ruby implementation of the reactor pattern but this
 time using 0mq sockets rather than POSIX sockets.
 
@@ -22,19 +22,19 @@ It is possible to extend the 0mq library to "poll" normal file
 descriptors. This isn't on my roadmap but patches are accepted.}
   s.email = %q{cremes@mac.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "version.txt"]
-  s.files = [".bnsignore", ".gitignore", "History.txt", "README.rdoc", "Rakefile", "examples/fake_ftp.rb", "examples/one_handed_ping_pong.rb", "examples/ping_pong.rb", "examples/pub_sub.rb", "examples/throttled_ping_pong.rb", "lib/zm/address.rb", "lib/zm/deferrable.rb", "lib/zm/exceptions.rb", "lib/zm/message.rb", "lib/zm/reactor.rb", "lib/zm/sockets.rb", "lib/zm/sockets/base.rb", "lib/zm/sockets/pair.rb", "lib/zm/sockets/pub.rb", "lib/zm/sockets/rep.rb", "lib/zm/sockets/req.rb", "lib/zm/sockets/sub.rb", "lib/zm/sockets/xrep.rb", "lib/zm/sockets/xreq.rb", "lib/zm/timers.rb", "lib/zmqmachine.rb", "spec/spec_helper.rb", "spec/zmqmachine_spec.rb", "version.txt", "zmqmachine.gemspec"]
+  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/fake_ftp.rb", "examples/one_handed_ping_pong.rb", "examples/ping_pong.rb", "examples/pub_sub.rb", "examples/pubsub_forwarder.rb", "examples/throttled_ping_pong.rb", "lib/zm/address.rb", "lib/zm/deferrable.rb", "lib/zm/devices.rb", "lib/zm/devices/forwarder.rb", "lib/zm/devices/queue.rb", "lib/zm/exceptions.rb", "lib/zm/message.rb", "lib/zm/reactor.rb", "lib/zm/sockets.rb", "lib/zm/sockets/base.rb", "lib/zm/sockets/pair.rb", "lib/zm/sockets/pub.rb", "lib/zm/sockets/rep.rb", "lib/zm/sockets/req.rb", "lib/zm/sockets/sub.rb", "lib/zm/sockets/xrep.rb", "lib/zm/sockets/xreq.rb", "lib/zm/timers.rb", "lib/zmqmachine.rb", "spec/spec_helper.rb", "spec/zmqmachine_spec.rb", "version.txt", "zmqmachine.gemspec"]
   s.homepage = %q{http://github.com/chuckremes/zmqmachine}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{zmqmachine}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ZMQMachine is another Ruby implementation of the reactor pattern but this time using 0mq sockets rather than POSIX sockets}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.5.0"])
       s.add_development_dependency(%q<bones>, [">= 3.4.7"])
     else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 3
-    - 1
-  version: 0.3.1
+    - 2
+  version: 0.3.2
 platform: ruby
 authors: 
   - Chuck Remes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -05:00
+date: 2010-08-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -70,7 +70,6 @@ extra_rdoc_files:
   - version.txt
 files: 
   - .bnsignore
-  - .gitignore
   - History.txt
   - README.rdoc
   - Rakefile
@@ -78,9 +77,13 @@ files:
   - examples/one_handed_ping_pong.rb
   - examples/ping_pong.rb
   - examples/pub_sub.rb
+  - examples/pubsub_forwarder.rb
   - examples/throttled_ping_pong.rb
   - lib/zm/address.rb
   - lib/zm/deferrable.rb
+  - lib/zm/devices.rb
+  - lib/zm/devices/forwarder.rb
+  - lib/zm/devices/queue.rb
   - lib/zm/exceptions.rb
   - lib/zm/message.rb
   - lib/zm/reactor.rb

data/.gitignore

@@ -1,14 +0,0 @@
-html
-pkg
-doc
-*.gem
-*.rbc
-*.tmproj
-nbproject
-*.bundle
-*.o
-.DS_Store
-examples/work
-benchmark
-*~
-*#*