sorta-parallel 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d6441088d9b1c3bb231dedb38852bc1b93a23707dc166e457dde7667405cf0
-  data.tar.gz: eabb6a5c0c9a5a654ff14f2ec5d9a12eacd8c1672dae32d49d86fa3d56044bb6
+  metadata.gz: 2bf3d65c13dd764223f1bf6946351ac43e3dced1307fa20666d7becb5635fa5e
+  data.tar.gz: 66a6deb857fa7de088072fd50c56b2e462d2a8ef3bc925809af2290a5c6d9fff
 SHA512:
-  metadata.gz: 707fd1ddf2c16aadf35218b3de7a0b4b410cc7617749221e2b51a96c7f5b386bda838fb27b01cd8d655a3327d90fc3c8ab27e40e9e24793cc57b8d3b60ba723a
-  data.tar.gz: bd5de548cf4a8996841b2d3b4bce116571d5a749ae2464267609c7bf91a787d39384a495d18c5e5057861dc7c2a683239f0a509a3b87aa29bb15f9d32dcf642e
+  metadata.gz: 821903ba653e62b1483518bfabe14b9aa378b97b74b0102f750e8753199cbfc3afdf77ea855f9552e4653bc353c276f838764c9c0fb65678f985ac8da259c0fc
+  data.tar.gz: 9520d14a8246416d24ac38331974050ed3e8f88a15115cd8fb52ee469f87b45caeb61adb90e63f73049de03b94042951967364fab16ec59cf54f8bcde1a4d7c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorta-parallel (0.1.0)
+    sorta-parallel (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/examples/multiractor.rb

@@ -7,20 +7,32 @@ class IncrTask
 end
 
 r1 = Ractor.new(name: '1') do
-  source = [1,2,3]
-  Sorta::Parallel.map(source, IncrTask)
+  5.times.map do |i|
+    Thread.new do
+      source = (i..10).to_a
+      result = Sorta::Parallel.map(source, IncrTask)
+
+      puts "ractor: #{Ractor.current.name}, thread: #{i}  source: #{source.inspect}, result: #{result.inspect}"
+    end
+  end.each(&:join)
 end
 
 r2 = Ractor.new(name: '2') do
-  source = [9,10,11]
-  Sorta::Parallel.map(source, IncrTask)
+  5.times.map do |i|
+    Thread.new do
+      source = ((100+i)..(100+10)).to_a
+      result = Sorta::Parallel.map(source, IncrTask)
+
+      puts "ractor: #{Ractor.current.name} thread: #{i} source: #{source.inspect}, result: #{result.inspect}"
+    end
+  end.each(&:join)
 end
 
 workers = [r1, r2]
+loop do
+  break if workers.empty?
 
-while workers.any?
-  ractor, msg = Ractor.select(*workers)
-  puts "ractor ##{ractor.name}, result: #{msg.inspect}"
+  ractor, _ = Ractor.select(*workers)
   workers.delete(ractor)
 end
 

data/examples/multithread.rb

@@ -0,0 +1,16 @@
+require_relative '../lib/sorta/parallel.rb'
+
+class IncrTask
+  def call(num)
+    num + 1
+  end
+end
+
+5.times.map do |i|
+  Thread.new do
+    source = (i..10).to_a
+    result = Sorta::Parallel.map(source, IncrTask)
+
+    puts "source: #{source.inspect}, result: #{result.inspect}"
+  end
+end.each(&:join)

data/examples/simple.rb

@@ -6,9 +6,7 @@ class IncrTask
   end
 end
 
-source = [1,2,3]
+source = (1..10).to_a
 result = Sorta::Parallel.map(source, IncrTask)
 
 puts "source: #{source.inspect}, result: #{result.inspect}"
-
-

data/lib/sorta/parallel/executor.rb

@@ -2,12 +2,12 @@ module Sorta
   module Parallel
     class Executor
       def initialize(source, task_klass)
-        # Reactor.update_current_ractor!
+        Reactor.start!
 
         @source = source.dup
         @task_klass = task_klass
         @results = []
-        @result_pipe = Ractor.new { loop { Ractor.yield(Ractor.receive) } }
+        @response_queue = Queue.new
       end
 
       def each!
@@ -17,19 +17,17 @@ module Sorta
 
       def map!
         @source.each_with_index do |item, i|
-          pipe.send([@task_klass, @result_pipe, item, i])
+          Reactor.register([@task_klass, @response_queue, item, i])
         end
 
-        results = @source.size.times.map { @result_pipe.take }
-        raise 'oh no no no' if results.include?(Signals::Error)
+        @source.size.times do
+          @results << @response_queue.pop
+        end
 
-        # sort by index
-        results.sort_by(&:last).transpose.first
-      end
+        raise 'oh no no no' if @results.include?(Signals::Error)
 
-      def pipe
-        # Ractor.current[:sorta_parallel_pipe]
-        Reactor::PIPE
+        # sort by index
+        @results.sort_by(&:last).transpose.first
       end
     end
   end

data/lib/sorta/parallel/reactor.rb

@@ -2,11 +2,48 @@ require 'etc'
 
 module Sorta
   module Parallel
-    # globalstate, EEEW!!!
     module Reactor
-      PIPE = Ractor.new { loop { Ractor.yield(Ractor.receive) } }
-      # TODO: get count from env or from something else
-      WORKERS = Etc.nprocessors.times.map { Worker.new(PIPE) }.freeze
+      def self.request_pipe
+        Ractor.current[:request_pipe] ||= Ractor.new { loop { Ractor.yield(Ractor.receive) } }
+      end
+
+      def self.result_pipe
+        Ractor.current[:result_pipe] ||= Ractor.new { loop { Ractor.yield(Ractor.receive) } }
+      end
+
+      def self.workers
+        Ractor.current[:workers] ||= Etc.nprocessors.times.map { Worker.new(request_pipe) }.freeze
+      end
+
+      def self.queues
+        Ractor.current[:queues] ||= {}
+      end
+
+      def self.register(task)
+        queues[task[1].object_id] = task[1]
+        safe_task = task.dup
+        safe_task[1] = task[1].object_id
+        request_pipe << [safe_task, result_pipe]
+      end
+
+      def self.start!
+        request_pipe
+        result_pipe
+        workers
+
+        Ractor.current[:thread] ||=
+          Thread.new do
+            loop do
+              msg = result_pipe.take
+              result_queue = queues[msg[1]]
+              result_queue.push(msg)
+            rescue => e
+              puts e.message
+              puts e.backtrace.join("\n")
+              next
+            end
+          end
+      end
     end
   end
 end

data/lib/sorta/parallel/version.rb

@@ -1,5 +1,5 @@
 module Sorta
   module Parallel
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/sorta/parallel/worker.rb

@@ -4,10 +4,8 @@ module Sorta
       def self.new(pipe)
         super(pipe) do |pipe|
           loop do
-            task, result_pipe, data, index = pipe.take
-            break if task.is_a?(Tasks::Quit)
-
-            result_pipe.send([task.new.call(data), index], move: true)
+            (task, queue_id, data, index), result_pipe = pipe.take
+            result_pipe.send([task.new.call(data), queue_id, index], move: true)
           rescue
             result_pipe.send(Signals::Error.new, move: true)
             next

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorta-parallel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mihail Odebe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -28,6 +28,7 @@ files:
 - bin/console
 - bin/setup
 - examples/multiractor.rb
+- examples/multithread.rb
 - examples/simple.rb
 - lib/sorta/parallel.rb
 - lib/sorta/parallel/executor.rb