omq-rfc-p2p 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86743c3379d11a5ea3bdb71c975f8ec6276ae9b2ebe54048104992e3c3b07c3
-  data.tar.gz: c3a77af3a4b608faf27805a9d49311cfcc058cc527b629b494753679f6295489
+  metadata.gz: 12e2e86aa1f397b596f7aa6458d85da70ac73fbfb5dadfb13c2717a8980458ff
+  data.tar.gz: 4afbd096dd1b9db0e056a11895ea0d881dc9232ed5276308e060c8f2c3afab22
 SHA512:
-  metadata.gz: dae092316604a8a0b9aeb8e6ce464cee5dc655d44730e89b1725536b082ea0f68fe59409145cef45780e1883197d0da1ab5352124d093783829da5aaaf8973f0
-  data.tar.gz: 5d7d48d4036683a862ff35d621502a0b4be3acf8070543fca08f67a14229d1adfc8a5519320780e17e0d00874fc95fabd043ae403dadad713c2790d7e8d04f89
+  metadata.gz: 9d1ee5c58d9af01e45c97652dec44917394d44a693fa18fe20ed17ffc2a0ca2c01bf735164d1275bbe3e16a145ea555d80e9b043907e25d8e1e055f6ff8ddcf1
+  data.tar.gz: deadb7fcc0314baa64d00b21f7f0713b4d70d04db60c05d94812d838b243365e674e7d481e10d8c729c7377828c6dada3bbf99b5f39cde324697412813a21a64

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

@@ -4,7 +4,7 @@ module OMQ
   module RFC
     # PEER socket type extension (ZeroMQ RFC 51).
     module P2P
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/omq/routing/peer.rb

@@ -11,13 +11,11 @@ module OMQ
     # routes to the identified connection.
     #
     class Peer
-      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-p2p
 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: PEER socket type implementing ZeroMQ RFC 51 for the OMQ pure-Ruby ZeroMQ
   library.
 email: