omq-ractor 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37fbceaf8b22765e84ec6f0ee63d5fb290e227d88c5abab8d0f85f6169d028b
-  data.tar.gz: 5e75dccb8bdd313ae0cb1c25e79b9a10d9e13decb98d6ad042babebbcdea7437
+  metadata.gz: fc8588dc4362b294801c75c4c34f494bf9f5958fc4c772464ed0ed3f4000e1ad
+  data.tar.gz: d35730efb57a69a74df32763a70f6a94b22eda3db681408b6f9407ddcab398de
 SHA512:
-  metadata.gz: d2d2de879b721455d8d8f2e826f8c4de9e524f3a3f152fda0eee0b31410a0b9b7d2ec42d340288082e57647b1948789eb98aaa6138a177ea373e33b229f9190f
-  data.tar.gz: 2baa73f333c9600f9215ac3e49aea2de1149ea89786be62b8699b851000304f7b00078075026099bf1ec9074546d688027e3ae977e9ff6ce68b2a549894b8874
+  metadata.gz: 8ddedd9fac719c1b7ccffbc29931bf7647139c69dc965844f09eb526601f9c2a7501b635ce3381ccae81e1b4d137cc758e9345cd98ba1c037dae6ea7b30447ac
+  data.tar.gz: 56f0e7e5795151c47a0363341831c4e6a6e6d6450b5e51fb5302865d0d0d64dd28ee05428acecf40db00e8e7ac916392bf6b18347550d12ed910483fb907b800

data/README.md

@@ -1,6 +1,6 @@
 # OMQ::Ractor -- Networked Ractors
 
-[![CI](https://github.com/paddor/omq-ractor/actions/workflows/ci.yml/badge.svg)](https://github.com/paddor/omq-ractor/actions/workflows/ci.yml)
+[![CI](https://github.com/zeromq/omq.rb/actions/workflows/ci.yml/badge.svg)](https://github.com/zeromq/omq.rb/actions/workflows/ci.yml)
 [![Gem Version](https://img.shields.io/gem/v/omq-ractor?color=e9573f)](https://rubygems.org/gems/omq-ractor)
 [![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg)](LICENSE)
 [![Ruby](https://img.shields.io/badge/Ruby-%3E%3D%204.0-CC342D?logo=ruby&logoColor=white)](https://www.ruby-lang.org)
@@ -119,7 +119,7 @@ end
 ```
 
 Topic prefix matching works normally. The topic stays as a plain string
-frame; only the payload is serialized.
+frame. Only the payload is serialized.
 
 ### Worker pool
 
@@ -215,7 +215,7 @@ a Reactor.run round-trip per message.
 Setup handshake: the worker must call `omq.sockets` as its first
 action. This creates worker-owned input ports, sends them to the main
 Ractor, and returns SocketProxy objects. The main Ractor waits up to
-100ms; if the handshake doesn't complete, the Ractor is stopped and
+100ms. If the handshake doesn't complete, the Ractor is stopped and
 an error is raised.
 
 

data/lib/omq/ractor.rb

@@ -31,7 +31,7 @@ module OMQ
   #
   class Ractor
 
-    HANDSHAKE_TIMEOUT = 5
+    HANDSHAKE_TIMEOUT = 1
 
 
     # Socket types that use topic/group-based routing.
@@ -43,7 +43,7 @@ module OMQ
     # -- Connection wrappers -------------------------------------------
 
     # Mixed into all connection wrappers so is_a? checks against
-    # the wrapped class (e.g. DirectPipe) still work.
+    # the wrapped class (e.g. Pipe) still work.
     #
     module TransparentDelegator
       # @param klass [Class] class to check against
@@ -121,7 +121,7 @@ module OMQ
     end
 
 
-    # Wraps an inproc DirectPipe with Ractor.make_shareable.
+    # Wraps an inproc Pipe with Ractor.make_shareable.
     #
     class ShareableConnection < SimpleDelegator
       include TransparentDelegator
@@ -398,6 +398,14 @@ module OMQ
           serialize: serialize, topic_type: topic_type }
       end
 
+      # REQ/REP input bridges must wait for the matching send before reading
+      # again. REP starts with a receive; REQ starts with a send.
+      @receive_permits = sockets.map do |socket|
+        next unless socket.is_a?(REQ) || socket.is_a?(REP)
+
+        Async::Queue.new.tap { |queue| queue.enqueue(true) if socket.is_a?(REP) }
+      end
+
 
       # Main Ractor creates output ports (one per writable socket)
       @output_ports = socket_configs.map { |cfg| cfg[:writable] ? ::Ractor::Port.new : nil }
@@ -525,10 +533,10 @@ module OMQ
       @sockets.each_with_index do |socket, i|
         cache      = SerializeCache.new
         topic_type = socket_configs[i][:topic_type]
-        engine     = socket.instance_variable_get(:@engine)
+        engine     = socket.engine
 
         engine.connection_wrapper = ->(conn) do
-          inproc = conn.is_a?(Transport::Inproc::DirectPipe)
+          inproc = conn.is_a?(Transport::Inproc::Pipe)
           if topic_type
             inproc ? TopicShareableConnection.new(conn) : TopicMarshalConnection.new(conn, cache)
           else
@@ -548,9 +556,11 @@ module OMQ
 
         do_serialize = socket_configs[i][:serialize]
         topic_type   = socket_configs[i][:topic_type]
+        permit       = @receive_permits[i]
 
         @input_tasks << @parent_task.async(transient: true, annotation: "ractor input bridge") do
           loop do
+            permit&.dequeue
             msg = socket.receive
             if do_serialize && !topic_type
               msg = msg.first
@@ -579,11 +589,9 @@ module OMQ
         port = output_ports[i]
         next unless port
 
-        do_serialize = socket_configs[i][:serialize]
-        topic_type   = socket_configs[i][:topic_type]
-        engine       = socket.instance_variable_get(:@engine)
-        queue        = Thread::Queue.new
-        rd, wr       = IO.pipe
+        engine = socket.engine
+        queue  = Thread::Queue.new
+        rd, wr = IO.pipe
         @output_pipes << rd << wr
 
         # Thread: port.receive -> queue + pipe signal
@@ -607,13 +615,9 @@ module OMQ
             rd.read_nonblock(4096) rescue nil
 
             while (msg = queue.pop(true) rescue nil)
-              if do_serialize
-                parts = topic_type && msg.is_a?(Array) ? msg : [msg]
-                engine.enqueue_send(parts)
-              else
-                parts = socket.__send__(:freeze_message, msg)
-                engine.enqueue_send(parts)
-              end
+              parts = msg.is_a?(Array) ? msg : [msg]
+              engine.enqueue_send(parts)
+              @receive_permits[i]&.enqueue(true)
             end
           rescue IOError, Async::Stop
             break

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-ractor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Patrik Wenger
@@ -13,16 +13,16 @@ dependencies:
   name: omq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.28'
 email:
 - paddor@gmail.com
 executables: []
@@ -33,7 +33,7 @@ files:
 - README.md
 - lib/omq-ractor.rb
 - lib/omq/ractor.rb
-homepage: https://github.com/paddor/omq-ractor
+homepage: https://github.com/zeromq/omq.rb/tree/main/gems/omq-ractor
 licenses:
 - ISC
 metadata: {}
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Bridge OMQ sockets into Ruby Ractors for true parallel processing
 test_files: []