omq-ractor 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a5648228e78d1c9b2a8f4262f24ac561c7160f72023c8eceff5b97092869a5
-  data.tar.gz: b6314c18b53f4c0fef2ab27b6a9875def79315e4d4fad1a304463d4aedafaed7
+  metadata.gz: 33bdfec66293ba5838114ae557b6ce2f1e99f52e6b930fd8cfad82bf97950827
+  data.tar.gz: c7370bc226312e82c3aafba801bfbc29a743c4fbfeb2d8ea028f23ec0b9a6ac9
 SHA512:
-  metadata.gz: 2423d2faa42c4fea749eee4e278f0584ad53d19d2f2f578cb949f1a7d5172e501a13290aa9fa9a7b5c6fbbd1633adcf03d375810edc49d45ca1276792fe6a986
-  data.tar.gz: ea22884ba96d26427eee41b4f7764ef7ec05674d381ab4bb3dabc86bc22d68858268dcc381bf34cd4b465125d3b13739aa211e4cb55ae4e19d6e80e5f2b1f42b
+  metadata.gz: 5cbc8e3b3c4c3c712d4da7015e78a0e6a970a2cdeea377a41ceb9c9bcfde5e63aca9dff7320fe6ab1c5d7669f6d2d91b345d357ea183accf9ca1684e892579d6
+  data.tar.gz: 4f97b42bc7835c12dc89c47390e4d6b80119db3c7eb0852be9508b8f5e633cb7b3e1e0f85db5d6776088745434591d448a51d0b89eb7b65c6a8fc6696c9bc914

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
@@ -107,6 +107,13 @@ module OMQ
       end
 
 
+      # @param batch [Array<Array<String>>] batch of message frames to serialize and write
+      # @return [void]
+      def write_messages(batch)
+        super(batch.map { |parts| [@cache.marshal(parts)] })
+      end
+
+
       # @return [Object] deserialized message
       def receive_message
         Marshal.load(super.first)
@@ -114,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
@@ -156,6 +163,13 @@ module OMQ
       end
 
 
+      # @param batch [Array<Array<String>>] batch of message frames; first frame is topic
+      # @return [void]
+      def write_messages(batch)
+        super(batch.map { |parts| [parts[0], @cache.marshal(parts[1..])] })
+      end
+
+
       # @return [Array<String>] deserialized message with topic as first element
       def receive_message
         parts = super
@@ -511,10 +525,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
@@ -565,11 +579,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
@@ -593,13 +605,8 @@ 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)
             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.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Patrik Wenger
@@ -13,16 +13,16 @@ dependencies:
   name: omq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        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.16
 specification_version: 4
 summary: Bridge OMQ sockets into Ruby Ractors for true parallel processing
 test_files: []