particle_pool 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36506753891f74213850afdb986921011c69aa5c0b860eae87c95cf4f50673e3
-  data.tar.gz: ee10f2b65bc8419085d329ebdefeef99cb5e7a2e9e09ffe3c1174e0456d59358
+  metadata.gz: 5d7d654c37d60427a15c1124ea54a033238802156368e9c663d37ef43eff26cf
+  data.tar.gz: a61d02e0285ddd57c913a84adbb06bdcee3ea5921b8bea434ebb0380421f654e
 SHA512:
-  metadata.gz: 36cddff2a62c774a5b0e844cdb582e294bbecdda79ef9d9154882c8d82bcb717ae7235d7f38e4cff2b80e1373c69b135977106439b7317eca9a4727f62124318
-  data.tar.gz: ed5e0a5d08c9b35641460dbe6b846c8179fc9bb1be400e3e94a8ef0f06ae5d14ca4e93669378f4e529544238870ceeba8726921a0f172eec77ca487f7c6f6c02
+  metadata.gz: 8ccc3eec762cad7a76e05bd3f3836210d714f0bcaf0559298d6a3aabff2384d1f56f2821b507208b004c376263351ac1b101b155acc0064ed4b3cee477539808
+  data.tar.gz: add0d9f2773a637132d2f64560021b50fb534cc1e67ed7ffa0be444eb0dfc85ceba1434df28b643d0d934955304ed790566fbd0cdd43bbe62777384c5b685fe9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    particle_pool (0.1.1)
+    particle_pool (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -18,51 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-```ruby
-# Require the library
-require 'particle_pool'
-
-# Create a new pool
-p = ParticlePool::Pool.new
-
-# Start it
-p.start
-
-(1024 * Etc.nprocessors).times do |i|
-  # Create some tasks
-  t = ParticlePool::Task.new do |n|
-    raise 'fib not defined for negative numbers' if n < 0
-    nv, ov = 1, 0
-    n.times do
-      nv, ov = nv + ov, nv
-      Fiber.yield
-    end
-    $arr << ov
-    $sz += 1
-    ov
-  end
-
-  # And push them into the pool.
-  p.push(t, i)
-end
-
-# You can wait for tasks to finish!
-t = ParticlePool::Task.new do
-  sleep 16
-  'Hello, World!'
-end
-p.push(t)
-
-puts t.await_sync
-
-# Wait for all results to appear
-while $sz != (1024 * Etc.nprocessors) do
-  sleep 1
-end
-
-# Sum results and print the final result
-puts $arr.reduce(:+)
-```
+You can find usage examples in the bin/ directory.
 
 ## Development
 

data/bin/test-pool.rb

@@ -6,12 +6,18 @@ require 'particle_pool'
 load File.dirname(__FILE__) + '/task.rb'
 
 p = ParticlePool::Pool.new
-p.start
+p.start 16
 
-$sz = 0
-$arr = []
+Result = Struct.new(:sz, :arr)
+Sum = Struct.new(:sz, :sum)
 
-(1024 * Etc.nprocessors).times do |i|
+res = Result.new
+res.sz = 0
+res.arr = []
+
+resbox = ParticlePool::Box.new res
+
+2048.times do |i|
   t = ParticlePool::Task.new do |n|
     raise 'fib not defined for negative numbers' if n < 0
     nv, ov = 1, 0
@@ -19,8 +25,8 @@ $arr = []
       nv, ov = nv + ov, nv
       Fiber.yield
     end
-    $arr << ov
-    $sz += 1
+    res.arr << ov
+    res.sz += 1
     ov
   end
 
@@ -33,10 +39,50 @@ t = ParticlePool::Task.new do
 end
 p.push(t)
 
-puts t.await_sync
+t2 = ParticlePool::Task.new do
+  puts t.await
+end
+p.push(t2)
 
-while $sz != (1024 * Etc.nprocessors) do
-  sleep 1
+abox = ParticlePool::Box.new
+t3 = ParticlePool::Task.new do
+  sleep 20
+  abox.value = 'asdf'
+end
+p.push(t3)
+
+t4 = ParticlePool::Task.new do
+  puts abox.await
+end
+p.push(t4)
+
+sum     = Sum.new
+sum.sz  = 0
+sum.sum = 0
+sumbox  = ParticlePool::Box.new sum
+
+tres = ParticlePool::Task.new do
+  resbox.await_block do
+    resbox.value.sz == 2048
+  end
+
+  resbox.value.arr.each do |i|
+    t = ParticlePool::Task.new do
+      sumbox.value.sz += 1
+      sumbox.value.sum += i
+    end
+    p.push(t)
+  end
+
+  sumbox.await_block do
+    sumbox.value.sz == 2048
+  end
+
+  puts sumbox.value.sum
 end
+p.push(tres)
 
-puts $arr.reduce(:+)
+while sumbox.value.sz != 2048 do
+  sleep 1
+end
+sleep 2

data/lib/particle_pool.rb

@@ -8,4 +8,5 @@ require 'thread'
 require 'particle_pool/version'
 require 'particle_pool/task'
 require 'particle_pool/pool_thread'
-require 'particle_pool/pool'
+require 'particle_pool/pool'
+require 'particle_pool/box'

data/lib/particle_pool/box.rb

@@ -0,0 +1,47 @@
+class ParticlePool::Box
+  attr_accessor :value, :extra
+
+  def initialize(value = nil)
+    @value = value
+    @extra = nil
+  end
+
+  def await(s=0.01)
+    until @value
+      Fiber.yield
+      sleep(s)
+    end
+    @value
+  end
+
+  def await_sync(s=0.01)
+    sleep(s) until @value
+    @value
+  end
+
+  def await_for(v, s=0.01)
+    until @value == v
+      Fiber.yield
+      sleep(s)
+    end
+    @value
+  end
+
+  def await_for_sync(v, s=0.01)
+    sleep(s) until @value == v
+    @value
+  end
+
+  def await_block(s=0.01, &b)
+    until b.()
+      Fiber.yield
+      sleep(s)
+    end
+    @value
+  end
+
+  def await_block_sync(s=0.01, &b)
+    sleep(s) until b.()
+    @value
+  end
+end

data/lib/particle_pool/pool.rb

@@ -1,6 +1,9 @@
 class ParticlePool::Pool
   def initialize
-    @threads = []
+    @mtx         = Mutex.new
+    @threads     = []
+    @round_robin = false
+    @iter        = @threads.each
   end
 
   def <<(t, *args, **kwargs)
@@ -8,9 +11,11 @@ class ParticlePool::Pool
   end
 
   def push(t, *args, **kwargs)
-    thr = @threads.min
-    raise 'no threads available' unless t
-    thr.push(t, *args, **kwargs)
+    @mtx.synchronize do
+      thr = @threads.min
+      raise 'no threads available' unless t
+      thr.push(t, *args, **kwargs)
+    end
   end
 
   def start(size = Etc.nprocessors)

data/lib/particle_pool/pool_thread.rb

@@ -5,6 +5,7 @@ class ParticlePool::PoolThread
 
   def initialize
     @queue = Queue.new
+    @mtx   = Mutex.new
     @tasks = 0
   end
 
@@ -13,12 +14,14 @@ class ParticlePool::PoolThread
   end
 
   def push(t, *args, **kwargs)
-    @tasks += 1
-    @queue << {
-      task: t,
-      args: args,
-      kwargs: kwargs
-    }
+    @mtx.synchronize do
+      @tasks += 1
+      @queue << {
+        task: t,
+        args: args,
+        kwargs: kwargs
+      }
+    end
   end
 
   def <=>(other)

data/lib/particle_pool/version.rb

@@ -1,3 +1,3 @@
 module ParticlePool
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: particle_pool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nickolay Ilyushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - bin/test-task.rb
 - bin/test-thread.rb
 - lib/particle_pool.rb
+- lib/particle_pool/box.rb
 - lib/particle_pool/pool.rb
 - lib/particle_pool/pool_thread.rb
 - lib/particle_pool/task.rb