omq-rfc-clientserver 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d657d656abf8f6ef632439303ec0059551b1d899f7b49a101f53e77dd628ba
-  data.tar.gz: 0b1320c47bfab9a99ba4db0c60debefe0b1656fcd7dc12ee53037d551c38a2c5
+  metadata.gz: 66df86a8254e8f9ecff91aae1fe325bbab16b3cb3a9aeaa32b18cafead1ba8fb
+  data.tar.gz: 9ab8ce1147441a6141714aac65f87a51922500583c0a32a598e2d312c514678f
 SHA512:
-  metadata.gz: c79ddc223fc0558a46d941dc5e2cc394e619d67464a02d64ec2367a36765d5fc4e18c4d6e0924d1992a8c4185053449fe1b076987b1392ddc2f72cbd104b4a3d
-  data.tar.gz: 74966ec22584ef760f6ad14dac08e1a348940744b15bf38956549e8ad63389fdd2a5d0052a805d3277290d9d0dfd4bc3896889d82742e39c68bdfa505adb9cdc
+  metadata.gz: 5a7f273606aa1ab9a9b124270aabc655b6a94974da3b86a26f43587de6dbec72198f6d3f73e2a6c319b1440f94a993c9157edd51a77e0610af3f3ff3662d9263
+  data.tar.gz: 2865614168c2ecc3a1212837f234c9c34cfb66f6b3a691ca8742af93ded4396e5bf78c271d0939debd9989180a2801a3819d7920b7e1da0e140d7aaed2a342a6

data/lib/omq/rfc/clientserver/version.rb

@@ -4,7 +4,7 @@ module OMQ
   module RFC
     # CLIENT/SERVER socket types extension (ZeroMQ RFC 41).
     module ClientServer
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/omq/routing/client.rb

@@ -8,27 +8,46 @@ module OMQ
     #
     class Client
       include RoundRobin
-      include FairRecv
 
       # @param engine [Engine]
       #
       def initialize(engine)
         @engine     = engine
-        @recv_queue = FairQueue.new
+        @recv_queue = Routing.build_queue(engine.options.recv_hwm, :block)
         @tasks      = []
         init_round_robin(engine)
       end
 
 
-      # @return [FairQueue]
+      # @return [Async::LimitedQueue]
       #
       attr_reader :recv_queue
 
+
+      # Dequeues the next received message. Blocks until one is available.
+      #
+      # @return [Array<String>, nil]
+      #
+      def dequeue_recv
+        @recv_queue.dequeue
+      end
+
+
+      # Wakes a blocked {#dequeue_recv} with a nil sentinel.
+      #
+      # @return [void]
+      #
+      def unblock_recv
+        @recv_queue.enqueue(nil)
+      end
+
+
       # @param connection [Connection]
       #
       def connection_added(connection)
         @connections << connection
-        add_fair_recv_connection(connection)
+        task = @engine.start_recv_pump(connection, @recv_queue)
+        @tasks << task if task
         add_round_robin_send_connection(connection)
       end
 
@@ -37,7 +56,6 @@ module OMQ
       #
       def connection_removed(connection)
         @connections.delete(connection)
-        @recv_queue.remove_queue(connection)
         remove_round_robin_send_connection(connection)
       end
 

data/lib/omq/routing/server.rb

@@ -11,13 +11,11 @@ module OMQ
     # routes to the identified connection.
     #
     class Server
-      include FairRecv
-
       # @param engine [Engine]
       #
       def initialize(engine)
         @engine                     = engine
-        @recv_queue                 = FairQueue.new
+        @recv_queue                 = Routing.build_queue(engine.options.recv_hwm, :block)
         @connections_by_routing_id  = {}
         @routing_id_by_connection   = {}
         @conn_queues                = {}
@@ -26,10 +24,29 @@ module OMQ
       end
 
 
-      # @return [FairQueue]
+      # @return [Async::LimitedQueue]
       #
       attr_reader :recv_queue
 
+
+      # Dequeues the next received message. Blocks until one is available.
+      #
+      # @return [Array<String>, nil]
+      #
+      def dequeue_recv
+        @recv_queue.dequeue
+      end
+
+
+      # Wakes a blocked {#dequeue_recv} with a nil sentinel.
+      #
+      # @return [void]
+      #
+      def unblock_recv
+        @recv_queue.enqueue(nil)
+      end
+
+
       # @param connection [Connection]
       #
       def connection_added(connection)
@@ -37,7 +54,8 @@ module OMQ
         @connections_by_routing_id[routing_id] = connection
         @routing_id_by_connection[connection]  = routing_id
 
-        add_fair_recv_connection(connection) { |msg| [routing_id, *msg] }
+        task = @engine.start_recv_pump(connection, @recv_queue) { |msg| [routing_id, *msg] }
+        @tasks << task if task
 
         q = Routing.build_queue(@engine.options.send_hwm, :block)
         @conn_queues[connection] = q
@@ -50,7 +68,6 @@ module OMQ
       def connection_removed(connection)
         routing_id = @routing_id_by_connection.delete(connection)
         @connections_by_routing_id.delete(routing_id) if routing_id
-        @recv_queue.remove_queue(connection)
         @conn_queues.delete(connection)
         @conn_send_tasks.delete(connection)&.stop
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-rfc-clientserver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Patrik Wenger
@@ -13,16 +13,16 @@ dependencies:
   name: omq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
 description: CLIENT and SERVER socket types implementing ZeroMQ RFC 41 for the OMQ
   pure-Ruby ZeroMQ library.
 email: