threadpool 0.0.1 → 0.0.1.1

data/README.md

@@ -4,8 +4,22 @@ All the implementations I looked at were either buggy or wasted CPU resources
 for no apparent reason, for example used a sleep of 0.01 seconds to then check for
 readiness and stuff like this.
 
-This implementation uses `IO.select` instead, there is no timed sleep, it just only stays
+This implementation uses `IO.select` instead, there is no timed sleep, it just stays
 there waiting for input, which will then come from a `#wake_up` call that writes on a pipe.
 
 `IO.select` should be present everywhere so this should be cross-platform and doesn't waste
 CPU resources. Keep in mind that each worker uses 2 file descriptors (reading and writing pipe).
+
+Example
+-------
+
+```ruby
+require 'threadpool'
+
+pool = ThreadPool.new
+pool.resize(4)
+
+0.upto(10) { pool.process { sleep 2; puts 'lol' } }
+```
+
+You should get 4 lols every 2 seconds.

data/lib/threadpool.rb

@@ -36,19 +36,23 @@ class ThreadPool
 	class Worker
 		include Awakenable
 
-		def initialize (watcher = nil)
-			@watcher = watcher
-			@mutex   = Mutex.new
+		def initialize (pool)
+			@pool  = pool
+			@mutex = Mutex.new
 
 			@thread = Thread.new {
 				loop do
 					if @block
-						@block.call(*@args) rescue nil
+						begin
+							@block.call(*@args)
+						rescue Exception => e
+							@pool.raise(e)
+						end
 
 						@block = nil
 						@args  = nil
 
-						@watcher.wake_up if @watcher
+						@pool.wake_up
 					else
 						sleep
 
@@ -97,24 +101,27 @@ class ThreadPool
 
 	extend Forwardable
 
-	def_delegators :@watcher, :kill, :die?, :dead?
+	attr_reader    :watcher, :size
+	def_delegators :@watcher, :sleep, :wake_up, :kill, :die?, :dead?, :join
+	def_delegators :@current, :raise
 
 	def initialize (size = 2)
 		@size    = 0
 		@queue   = Queue.new
 		@pool    = []
-		@watcher = Worker.new
+		@watcher = Worker.new(self)
+		@current = Thread.current
 		
 		@watcher.process {
 			loop do
-				@watcher.sleep if @queue.empty?
-				next           if @queue.empty?
+				sleep if @queue.empty?
+				next  if @queue.empty?
 
 				begin
-					worker = @pool.find(&:available?) or @watcher.sleep
+					worker = @pool.find(&:available?) or sleep
 				end until worker
 
-				break if @watcher.die?
+				break if die?
 
 				args, block = @queue.pop
 
@@ -127,16 +134,12 @@ class ThreadPool
 		resize(size)
 	end
 
-	def join
-		@watcher.join
-	end; alias wait join
-
 	def resize (size)
 		return if @size == size
 
 		if @size < size
 			1.upto(size - @size) {
-				@pool << Worker.new(@watcher)
+				@pool << Worker.new(self)
 			}
 		else
 			1.upto(@size - size) {

data/threadpool.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'threadpool'
-	s.version      = '0.0.1'
+	s.version      = '0.0.1.1'
 	s.author       = 'meh.'
 	s.email        = 'meh@paranoici.org'
 	s.homepage     = 'http://github.com/meh/threadpool'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threadpool
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors: