omq-cli 0.7.1 → 0.8.0

data/lib/omq/cli/ractor_helpers.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module OMQ
+  module CLI
+    # Shared Ractor infrastructure for parallel worker modes.
+    module RactorHelpers
+      # Sentinel value sent through ports to signal consumer threads to exit.
+      # Port#close does not unblock a waiting #receive, so we must send an
+      # explicit shutdown marker.
+      SHUTDOWN = :__omq_shutdown__
+
+
+      # Resolves TCP hostnames to IP addresses so Ractors don't touch
+      # Resolv::DefaultResolver (which is not shareable).
+      #
+      def self.preresolve_tcp(endpoints)
+        endpoints.flat_map do |ep|
+          url = ep.url
+          if url.start_with?("tcp://")
+            host, port = OMQ::Transport::TCP.parse_endpoint(url)
+            Addrinfo.getaddrinfo(host, port, nil, :STREAM).map do |addr|
+              ip = addr.ip_address
+              ip = "[#{ip}]" if ip.include?(":")
+              Endpoint.new("tcp://#{ip}:#{addr.ip_port}", ep.bind?)
+            end
+          else
+            ep
+          end
+        end
+      end
+
+
+      # Starts a Ractor::Port and a consumer thread that drains log
+      # messages to stderr sequentially. Returns [port, thread].
+      # Send SHUTDOWN through the port to stop the consumer.
+      #
+      def self.start_log_consumer
+        port = Ractor::Port.new
+        thread = Thread.new(port) do |p|
+          loop do
+            msg = p.receive
+            break if msg.equal?(SHUTDOWN)
+            $stderr.write("#{msg}\n")
+          rescue Ractor::ClosedError
+            break
+          end
+        end
+        [port, thread]
+      end
+
+
+      # Starts a Ractor::Port and a consumer thread that drains
+      # formatted output to stdout sequentially. Returns [port, thread].
+      # Send SHUTDOWN through the port to stop the consumer.
+      #
+      def self.start_output_consumer
+        port = Ractor::Port.new
+        thread = Thread.new(port) do |p|
+          loop do
+            msg = p.receive
+            break if msg.equal?(SHUTDOWN)
+            $stdout.write(msg)
+          rescue Ractor::ClosedError
+            break
+          end
+        end
+        [port, thread]
+      end
+
+
+      # Sends the shutdown sentinel and joins the consumer thread.
+      #
+      def self.stop_consumer(port, thread)
+        port.send(SHUTDOWN)
+        thread.join
+      rescue Ractor::ClosedError
+        thread.join(1)
+      end
+    end
+  end
+end

data/lib/omq/cli/req_rep.rb

@@ -37,6 +37,11 @@ module OMQ
 
     # Runner for REP sockets (synchronous request-reply server).
     class RepRunner < BaseRunner
+      def call(task)
+        config.parallel ? run_parallel_workers(:REP) : super
+      end
+
+
       private
 
 

data/lib/omq/cli/scatter_gather.rb

@@ -10,6 +10,14 @@ module OMQ
 
     # Runner for GATHER sockets (draft; fan-in receive).
     class GatherRunner < BaseRunner
+      def call(task)
+        config.parallel ? run_parallel_workers(:GATHER) : super
+      end
+
+
+      private
+
+
       def run_loop(task) = run_recv_logic
     end
   end

data/lib/omq/cli/socket_setup.rb

@@ -6,23 +6,30 @@ module OMQ
     # All methods are module-level so callers compose rather than inherit.
     #
     module SocketSetup
+      # Apply common socket options from +config+ to +sock+.
+      #
+      def self.apply_options(sock, config)
+        sock.linger             = config.linger
+        sock.recv_timeout       = config.timeout       if config.timeout
+        sock.send_timeout       = config.timeout       if config.timeout
+        sock.reconnect_interval = config.reconnect_ivl if config.reconnect_ivl
+        sock.heartbeat_interval = config.heartbeat_ivl if config.heartbeat_ivl
+        sock.send_hwm           = config.send_hwm      if config.send_hwm
+        sock.recv_hwm           = config.recv_hwm      if config.recv_hwm
+        sock.sndbuf             = config.sndbuf        if config.sndbuf
+        sock.rcvbuf             = config.rcvbuf        if config.rcvbuf
+      end
+
+
       # Create and fully configure a socket from +klass+ and +config+.
       #
       def self.build(klass, config)
-        sock_opts              = { linger: config.linger }
-        sock_opts[:conflate]   = true if config.conflate && %w[pub radio].include?(config.type_name)
-        sock                   = klass.new(**sock_opts)
-        sock.recv_timeout      = config.timeout    if config.timeout
-        sock.send_timeout      = config.timeout    if config.timeout
-        sock.max_message_size  = config.recv_maxsz if config.recv_maxsz
-        sock.send_hwm            = config.send_hwm       if config.send_hwm
-        sock.recv_hwm            = config.recv_hwm       if config.recv_hwm
-        sock.sndbuf              = config.sndbuf         if config.sndbuf
-        sock.rcvbuf              = config.rcvbuf         if config.rcvbuf
-        sock.reconnect_interval  = config.reconnect_ivl if config.reconnect_ivl
-        sock.heartbeat_interval  = config.heartbeat_ivl if config.heartbeat_ivl
-        sock.identity            = config.identity      if config.identity
-        sock.router_mandatory    = true if config.type_name == "router"
+        sock = klass.new
+        sock.conflate = true if config.conflate && %w[pub radio].include?(config.type_name)
+        apply_options(sock, config)
+        sock.max_message_size = config.recv_maxsz if config.recv_maxsz
+        sock.identity         = config.identity   if config.identity
+        sock.router_mandatory = true if config.type_name == "router"
         sock
       end
 

data/lib/omq/cli/transient_monitor.rb

@@ -31,7 +31,7 @@ module OMQ
 
 
       # Signal that the first message has been sent or received.
-      # Idempotent — safe to call multiple times.
+      # Idempotent -- safe to call multiple times.
       #
       def ready!
         @barrier.resolve(true) unless @barrier.resolved?

data/lib/omq/cli/version.rb

@@ -2,6 +2,6 @@
 
 module OMQ
   module CLI
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

data/lib/omq/cli.rb

@@ -18,6 +18,9 @@ require_relative "cli/req_rep"
 require_relative "cli/pair"
 require_relative "cli/router_dealer"
 require_relative "cli/client_server"
+require_relative "cli/ractor_helpers"
+require_relative "cli/parallel_worker"
+require_relative "cli/pipe_worker"
 require_relative "cli/pipe"
 
 module OMQ
@@ -168,7 +171,7 @@ module OMQ
           abort "CURVE requires libsodium. Install it:\n" \
                 "  apt install libsodium-dev    # Debian/Ubuntu\n" \
                 "  brew install libsodium       # macOS\n" \
-                "Or use nuckle (pure Ruby, DANGEROUS — not audited):\n" \
+                "Or use nuckle (pure Ruby, DANGEROUS -- not audited):\n" \
                 "  --crypto nuckle"
         end
       else
@@ -220,6 +223,7 @@ module OMQ
       end
 
       if config.type_name.nil?
+        Process.setproctitle("omq script")
         Object.include(OMQ) unless Object.include?(OMQ)
         Async annotation: 'omq' do
           Async::Debug.serve(endpoint: debug_ep) if debug_ep

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Patrik Wenger
@@ -165,9 +165,12 @@ files:
 - lib/omq/cli/expression_evaluator.rb
 - lib/omq/cli/formatter.rb
 - lib/omq/cli/pair.rb
+- lib/omq/cli/parallel_worker.rb
 - lib/omq/cli/pipe.rb
+- lib/omq/cli/pipe_worker.rb
 - lib/omq/cli/pub_sub.rb
 - lib/omq/cli/push_pull.rb
+- lib/omq/cli/ractor_helpers.rb
 - lib/omq/cli/radio_dish.rb
 - lib/omq/cli/req_rep.rb
 - lib/omq/cli/router_dealer.rb