omq-rfc-channel 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14060392a596605abfc8b2271521af046493eb3dd790c6c54b0912caf636248c
-  data.tar.gz: 01d874adeac30c7b8d859cc09dc9353716ddc4e7c4f25171dd1f355b617c3ca4
+  metadata.gz: 560233028466d50b5e666511949b43796797f672467a9870ee6f236d3d377d73
+  data.tar.gz: 1c2bd20ea115be3300aeef1a8584c7bec8fe218d147efebf3510e37deb6e5617
 SHA512:
-  metadata.gz: f264bdcb001dfa314c8df88130bc556c6da262139a00ce6bb0430c80354fca26a32563d036b2428207bf5dc6e666b2f6d17f860eb18eac81ac9cda2a725140b2
-  data.tar.gz: 92177bc4b476656dab7bfca9c36730e03a22d8a183e41817a2d2e84ad5cc5a4b58e4d86e0bed6d66792ace4cefb5eb42a7b9583d29225e41185b81641f0d74b8
+  metadata.gz: 313f3462098e21be10ca8ac34634fbff2622ddaff7404b9c845da897ea756f5886e207ca19d308907c3f391ad7c463967833aed334ab6173a6d960c6375d1288
+  data.tar.gz: b160c46dc8746fa6c2c20628826d4c4be0504e368877927121bd79533935d437aca1ab129ec4cb907ebd0c4aada9ae34ee812db0938bbe8122e7270763911b97

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

@@ -4,7 +4,7 @@ module OMQ
   module RFC
     # CHANNEL socket type extension (ZeroMQ RFC 52).
     module Channel
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/omq/routing/channel.rb

@@ -5,25 +5,42 @@ module OMQ
     # CHANNEL socket routing: exclusive 1-to-1 bidirectional.
     #
     class Channel
-      include FairRecv
-
       # @param engine [Engine]
       #
       def initialize(engine)
         @engine         = engine
         @connection     = nil
-        @recv_queue     = FairQueue.new
+        @recv_queue     = Routing.build_queue(engine.options.recv_hwm, :block)
         @send_queue     = nil
-        @staging_queue  = Routing.build_queue(@engine.options.send_hwm, :block)
+        @staging_queue  = Routing.build_queue(engine.options.send_hwm, :block)
         @send_pump      = nil
         @tasks          = []
       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]
       # @raise [RuntimeError] if a connection already exists
       #
@@ -31,7 +48,8 @@ module OMQ
         raise "CHANNEL allows only one peer" if @connection
         @connection = connection
 
-        add_fair_recv_connection(connection)
+        task = @engine.start_recv_pump(connection, @recv_queue)
+        @tasks << task if task
 
         unless connection.is_a?(Transport::Inproc::DirectPipe)
           @send_queue = Routing.build_queue(@engine.options.send_hwm, :block)
@@ -48,7 +66,6 @@ module OMQ
       def connection_removed(connection)
         if @connection == connection
           @connection = nil
-          @recv_queue.remove_queue(connection)
           @send_queue = nil
           @send_pump&.stop
           @send_pump = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-rfc-channel
 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: CHANNEL socket type implementing ZeroMQ RFC 52 for the OMQ pure-Ruby
   ZeroMQ library.
 email: