ractor-pool 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa7b2eb7fcac31583654e4122f532ae419fb009c8fbd5a42f1ddae61c3481c1
-  data.tar.gz: 98bd5aee0bfbf16c36afa9112b1fde3fa9470b42dbc01792559f04278725b510
+  metadata.gz: 2c1dea8867f0e74c842abc4eb14e058be7361695a0e280ac02e57663a6bc461d
+  data.tar.gz: f1b7d5d10dbc898a84990907625aeace403cb2d053fcce42947856aba64631e6
 SHA512:
-  metadata.gz: 78c0f02d1ab1b7944a78cecf776f25eb86ccb03861fa7b35cb1a163a4eaaddd1124e19d6ad7e342b46a356770bc65932dc9a695466ba105c4b0a2cc9980ca93a
-  data.tar.gz: a2878afecc2b0586f7fc51983a70bad3a531ac0260c0332d5018e429e0c0c5153a46fd35cd01694b616abb798e3534576b515216d08791c736de99cde5a3131a
+  metadata.gz: 3c07ae252a879363467f3d085bfbe573941bc2d733d6ab67a20a18b903f3acdc700404e7abdbacb8bb88b24246b3254898b207fde24605e25049dd1e72dd03e8
+  data.tar.gz: 1b4186600d78d0a4df2e84f4cb895de318c9562e5eed118b297e28109c8db3da0f1450230c76c5e1fbf8673e5ed670f74302044d695a8e339b0198c433c55354

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.2] - 2026-10-18
+
+- Collect worker results and errors on one thread
+
 ## [0.4.1] - 2026-07-20
 
 - Name the underlying thread of each worker and coordinator `Ractor`

data/lib/ractor-pool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RactorPool
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/ractor-pool.rb

@@ -59,6 +59,9 @@ class RactorPool
   SHUTDOWN = :shutdown
   private_constant :SHUTDOWN
 
+  WorkerError = Data.define(:full_message)
+  private_constant :WorkerError
+
   # @rbs @size: Integer
   # @rbs @worker: ^(untyped) -> untyped
   # @rbs @strategy: Symbol
@@ -68,12 +71,10 @@ class RactorPool
   # @rbs @in_flight: Atom[Integer]
   # @rbs @shutdown: Atom[bool]
   # @rbs @next_worker_index: Atom[Integer]?
-  # @rbs @result_port: Ractor::Port?
-  # @rbs @error_port: Ractor::Port?
+  # @rbs @collector_port: Ractor::Port?
   # @rbs @coordinator: Ractor?
   # @rbs @workers: Array[Ractor]
   # @rbs @collector: Thread?
-  # @rbs @error_collector: Thread?
 
   # Creates a new RactorPool with the specified number of workers.
   #
@@ -121,12 +122,10 @@ class RactorPool
     @shutdown  = Atom.new(false)
     @next_worker_index = Atom.new(-1) if size > 1 && strategy == :round_robin
 
-    @result_port = Ractor::Port.new if result_handler
-    @error_port  = Ractor::Port.new unless on_error
+    @collector_port = Ractor::Port.new if result_handler || !on_error
     @coordinator = start_coordinator if size > 1 && strategy == :coordinator
     @workers = start_workers
     @collector = start_collector
-    @error_collector = start_error_collector
   end
 
   # Queues a work item to be processed by an available worker.
@@ -203,10 +202,8 @@ class RactorPool
     else
       @workers.each { |worker| worker.send(SHUTDOWN, move: true) }
       @workers.each(&:join)
-      @result_port&.send(SHUTDOWN, move: true)
+      @collector_port&.send(SHUTDOWN, move: true)
     end
-    @error_port&.send(SHUTDOWN, move: true)
-    @error_collector&.join
     @collector&.join
   end
 
@@ -220,7 +217,7 @@ class RactorPool
     thread_name = String.new("#{self.class.name} coordinator thread")
     thread_name << " for #{@name}" if @name
 
-    Ractor.new(@size, @result_port, thread_name, name: ractor_name) do |worker_count, result_port, thread_name|
+    Ractor.new(@size, @collector_port, thread_name, name: ractor_name) do |worker_count, collector_port, thread_name|
       Thread.current.name = thread_name
 
       work_queue = []
@@ -237,7 +234,7 @@ class RactorPool
           waiting_workers.each { |worker| worker.send(SHUTDOWN, move: true) }
           waiting_workers.clear
           if workers_finished == worker_count
-            result_port&.send(SHUTDOWN, move: true)
+            collector_port&.send(SHUTDOWN, move: true)
             break
           end
 
@@ -251,7 +248,7 @@ class RactorPool
 
             workers_finished += 1
             if workers_finished == worker_count
-              result_port&.send(SHUTDOWN, move: true)
+              collector_port&.send(SHUTDOWN, move: true)
               break
             end
           else
@@ -273,6 +270,9 @@ class RactorPool
 
   # @rbs () -> Array[Ractor]
   def start_workers
+    result_port = @collector_port if @result_handler
+    error_port = @collector_port unless @on_error
+
     @size.times.map do |index|
       ractor_name = String.new("#{self.class.name} ractor #{index}")
       ractor_name << " for #{@name}" if @name
@@ -280,7 +280,7 @@ class RactorPool
       thread_name = String.new("#{self.class.name} worker thread #{index}")
       thread_name << " for #{@name}" if @name
 
-      Ractor.new(@worker, @on_error, @error_port, @coordinator, @result_port, thread_name, name: ractor_name) do |worker, on_error, error_port, coordinator, result_port, thread_name|
+      Ractor.new(@worker, @on_error, error_port, @coordinator, result_port, thread_name, name: ractor_name) do |worker, on_error, error_port, coordinator, result_port, thread_name|
         Thread.current.name = thread_name
 
         loop do
@@ -294,7 +294,7 @@ class RactorPool
 
             result_port&.send(result, move: true)
           rescue => error
-            on_error ? on_error.call(error) : error_port.send(error.full_message, move: true)
+            on_error ? on_error.call(error) : error_port.send(WorkerError.new(full_message: error.full_message), move: true)
           end
         end
       end
@@ -303,38 +303,23 @@ class RactorPool
 
   # @rbs () -> Thread?
   def start_collector
-    return unless @result_handler
+    return unless @collector_port
 
     thread_name = String.new("#{self.class.name} collector thread")
     thread_name << " for #{@name}" if @name
 
-    Thread.new(@result_port, @result_handler, thread_name) do |result_port, result_handler, name|
-      Thread.current.name = name
-
-      loop do
-        result = result_port.receive
-        break if result == SHUTDOWN
-
-        result_handler.call(result)
-      end
-    end
-  end
-
-  # @rbs () -> Thread?
-  def start_error_collector
-    return if @on_error
-
-    thread_name = String.new("#{self.class.name} error collector thread")
-    thread_name << " for #{@name}" if @name
-
-    Thread.new(@error_port, thread_name) do |error_port, name|
+    Thread.new(@collector_port, @result_handler, thread_name) do |collector_port, result_handler, name|
       Thread.current.name = name
 
       loop do
-        message = error_port.receive
-        break if message == SHUTDOWN
-
-        warn message
+        case message = collector_port.receive
+        when SHUTDOWN
+          break
+        when WorkerError
+          warn message.full_message
+        else
+          result_handler.call(message)
+        end
       end
     end
   end

data/sig/generated/ractor-pool.rbs

@@ -51,7 +51,16 @@ class RactorPool
 
   SHUTDOWN: ::Symbol
 
-  @error_collector: Thread?
+  class WorkerError < Data
+    attr_reader full_message(): untyped
+
+    def self.new: (untyped full_message) -> instance
+                | (full_message: untyped) -> instance
+
+    def self.members: () -> [ :full_message ]
+
+    def members: () -> [ :full_message ]
+  end
 
   @collector: Thread?
 
@@ -59,9 +68,7 @@ class RactorPool
 
   @coordinator: Ractor?
 
-  @error_port: Ractor::Port?
-
-  @result_port: Ractor::Port?
+  @collector_port: Ractor::Port?
 
   @next_worker_index: Atom[Integer]?
 
@@ -154,7 +161,4 @@ class RactorPool
 
   # @rbs () -> Thread?
   def start_collector: () -> Thread?
-
-  # @rbs () -> Thread?
-  def start_error_collector: () -> Thread?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ractor-pool
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Joshua Young
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A thread-safe, lock-free pool of Ractor workers with coordinator or round-robin
   dispatch for distributing work