omq 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0683eef1c05982186c434cfbb21112518ec220e843207fa772a3cc3cd69ee9
-  data.tar.gz: 95b92509cac850c9b45380675fec60ed3db22cc21674ffde09901742b024f43a
+  metadata.gz: f58b9e0c8c49bcdfb8dd80ec5eda6a6b6e5b09f04a2a7851001449449ba448fd
+  data.tar.gz: 0f6cbd451adc8b1d1cde0771d6535c5959f09e4b3f0442164b0544964755795e
 SHA512:
-  metadata.gz: 51b018f6e6d0fe83181e14fefc9f7cda13661cc3e071e2b83f2ed517e98e550eb22f9c7b7092696261ce4bd458a7355ccfe51cb44235c38df9004f6c72d7c31b
-  data.tar.gz: 7e4581c1f0e18714a30af54833d6cabef1001936d5f4126bde2fa6144dfe3b153b825dff82576a7abca0d61dc9f87b01f0a962f950c56c2d0a5803705addf1ca
+  metadata.gz: d7d13f97eeacf998f1e0137bdbc5dd4a471195ff628fd7da97720a019e30c2a9c200fab761c38943bbbada056bf81880e6ca2dd87d3936f150f0fa22566cebe5
+  data.tar.gz: f97931ecb4893ecd0155c37ea18793c9414bd57de6918496ef7af18bad714720aa2e146531788956265d6f85bc3e18f6dd403f71df8683913d322c94a6dd1bdb

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.22.1 — 2026-04-16
+
+### Changed
+
+- **Reuse batch arrays in send pumps.** All send pumps (RoundRobin,
+  Pair, ConnSendPump, FanOut, FanOut-conflate) now pre-allocate a
+  single batch array and clear it between cycles instead of
+  allocating a fresh `[msg]` per dequeue.
+
+- **`Routing.dequeue_batch`** consolidates the blocking-dequeue +
+  non-blocking-sweep pattern that was duplicated across four call
+  sites into one method. `dequeue_batch_capped` does the same for
+  the byte/message-capped RoundRobin variant.
+
+- **REP envelope stored as `[conn, envelope]`** instead of a Hash,
+  and reply assembly uses `<<` + `concat` instead of double splat.
+
+- **Heartbeat drops redundant `context: "".b`** — the default is
+  now `EMPTY_BINARY` in protocol-zmtp.
+
+- **Bench harness accepts `OMQ_BENCH_SIZES`, `OMQ_BENCH_TRANSPORTS`,
+  and `OMQ_BENCH_PEERS`** env vars to scope runs without editing
+  code.
+
 ## 0.22.0 — 2026-04-15
 
 ### Fixed

data/lib/omq/engine/heartbeat.rb

@@ -24,7 +24,7 @@ module OMQ
         tasks << parent.async(transient: true, annotation: "heartbeat") do
           loop do
             sleep interval
-            conn.send_command(Protocol::ZMTP::Codec::Command.ping(ttl: ttl, context: "".b))
+            conn.send_command(Protocol::ZMTP::Codec::Command.ping(ttl: ttl))
             if conn.heartbeat_expired?(timeout)
               conn.close
               break

data/lib/omq/routing/conn_send_pump.rb

@@ -18,9 +18,10 @@ module OMQ
       #
       def self.start(engine, conn, q, tasks)
         task = engine.spawn_conn_pump_task(conn, annotation: "send pump") do
+          batch = []
+
           loop do
-            batch = [q.dequeue]
-            Routing.drain_send_queue(q, batch)
+            Routing.dequeue_batch(q, batch)
 
             if batch.size == 1
               conn.write_message batch.first
@@ -30,7 +31,11 @@ module OMQ
 
             conn.flush
 
-            batch.each { |parts| engine.emit_verbose_msg_sent(conn, parts) }
+            batch.each do |parts|
+              engine.emit_verbose_msg_sent(conn, parts)
+            end
+
+            batch.clear
           end
         end
 

data/lib/omq/routing/fan_out.rb

@@ -181,14 +181,16 @@ module OMQ
       #
       def start_conn_send_pump_normal(conn, q, use_wire)
         @engine.spawn_conn_pump_task(conn, annotation: "send pump") do
+          batch = []
+
           loop do
-            batch = [q.dequeue]
-            Routing.drain_send_queue(q, batch)
+            Routing.dequeue_batch(q, batch)
 
             if write_matching_batch(conn, batch, use_wire)
               conn.flush
               batch.each { |parts| @engine.emit_verbose_msg_sent(conn, parts) }
             end
+            batch.clear
           end
         end
       end
@@ -227,14 +229,17 @@ module OMQ
       #
       def start_conn_send_pump_conflate(conn, q)
         @engine.spawn_conn_pump_task(conn, annotation: "send pump") do
+          batch = []
+
           loop do
-            batch = [q.dequeue]
-            Routing.drain_send_queue(q, batch)
+            Routing.dequeue_batch(q, batch)
 
             # Keep only the latest message that matches the subscription.
             latest = batch.reverse.find do |parts|
               subscribed?(conn, parts.first || EMPTY_BINARY)
             end
+
+            batch.clear
             next unless latest
 
             conn.write_message(latest)

data/lib/omq/routing/pair.rb

@@ -106,9 +106,10 @@ module OMQ
 
       def start_send_pump(conn)
         @send_pump = @engine.spawn_conn_pump_task(conn, annotation: "send pump") do
+          batch = []
+
           loop do
-            batch = [@send_queue.dequeue]
-            Routing.drain_send_queue(@send_queue, batch)
+            Routing.dequeue_batch(@send_queue, batch)
 
             if batch.size == 1
               conn.write_message(batch.first)
@@ -120,6 +121,7 @@ module OMQ
             batch.each do |parts|
               @engine.emit_verbose_msg_sent(conn, parts)
             end
+            batch.clear
           end
         end
 

data/lib/omq/routing/rep.rb

@@ -55,7 +55,7 @@ module OMQ
           envelope  = msg[0, delimiter]
           body      = msg[(delimiter + 1)..] || []
 
-          @pending_replies << { conn: connection, envelope: envelope }
+          @pending_replies << [connection, envelope]
           body
         end
         @tasks << task if task
@@ -69,7 +69,7 @@ module OMQ
       # @param connection [Connection]
       #
       def connection_removed(connection)
-        @pending_replies.reject! { |r| r[:conn] == connection }
+        @pending_replies.reject! { |r| r[0] == connection }
         @conn_queues.delete(connection)
         @conn_send_tasks.delete(connection)&.stop
       end
@@ -83,8 +83,12 @@ module OMQ
       def enqueue(parts)
         reply_info = @pending_replies.shift
         return unless reply_info
-        conn = reply_info[:conn]
-        @conn_queues[conn]&.enqueue([*reply_info[:envelope], EMPTY_FRAME, *parts])
+
+        conn, envelope = reply_info
+        msg = envelope
+        msg << EMPTY_FRAME
+        msg.concat(parts)
+        @conn_queues[conn]&.enqueue(msg)
       end
 
 

data/lib/omq/routing/req.rb

@@ -93,7 +93,7 @@ module OMQ
       # REQ prepends empty delimiter frame on the wire.
       #
       def transform_send(parts)
-        [EMPTY_BINARY, *parts]
+        parts.dup.unshift(EMPTY_BINARY)
       end
 
     end

data/lib/omq/routing/round_robin.rb

@@ -133,9 +133,10 @@ module OMQ
       #
       def start_conn_send_pump(conn)
         task = @engine.spawn_conn_pump_task(conn, annotation: "send pump") do
+          batch = []
+
           loop do
-            batch = [@send_queue.dequeue]
-            drain_send_queue_capped(batch)
+            dequeue_batch_capped(batch)
             @in_flight += batch.size
 
             begin
@@ -147,6 +148,7 @@ module OMQ
             batch.each do |parts|
               @engine.emit_verbose_msg_sent(conn, parts)
             end
+            batch.clear
 
             Async::Task.current.yield
           end
@@ -157,7 +159,8 @@ module OMQ
       end
 
 
-      def drain_send_queue_capped(batch)
+      def dequeue_batch_capped(batch = [])
+        batch << @send_queue.dequeue
         bytes = batch_bytes(batch.first)
 
         while batch.size < BATCH_MSG_CAP && bytes < BATCH_BYTE_CAP

data/lib/omq/routing.rb

@@ -57,7 +57,8 @@ module OMQ
 
 
     # Drains all available messages from +queue+ into +batch+ without
-    # blocking. Call after the initial blocking dequeue.
+    # Blocks for the first message, then sweeps all immediately
+    # available messages into +batch+ without blocking.
     #
     # No cap is needed: IO::Stream auto-flushes at 64 KB, so the
     # write buffer hits the wire naturally under sustained load.
@@ -67,7 +68,9 @@ module OMQ
     # @param batch [Array]
     # @return [void]
     #
-    def self.drain_send_queue(queue, batch)
+    def self.dequeue_batch(queue, batch = [])
+      batch << queue.dequeue
+
       loop do
         msg = queue.dequeue(timeout: 0) or break
         batch << msg

data/lib/omq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OMQ
-  VERSION = "0.22.0"
+  VERSION = "0.22.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Patrik Wenger