threadpool 0.0.3 → 0.1.0

data/README.md

@@ -4,11 +4,8 @@ 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 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).
+This implementation uses standard locking functions to work properly across multiple Ruby
+implementations.
 
 Example
 -------
@@ -16,8 +13,7 @@ Example
 ```ruby
 require 'threadpool'
 
-pool = ThreadPool.new
-pool.resize(4)
+pool = ThreadPool.new(4)
 
 0.upto(10) { pool.process { sleep 2; puts 'lol' } }
 

data/lib/threadpool.rb

@@ -8,146 +8,143 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'forwardable'
 require 'thread'
 
-module Awakenable
-	def sleep (time = nil)
-		@awakenable ||= IO.pipe
+class ThreadPool
+	attr_reader :min, :max, :spawned
 
-		begin
-			@awakenable.first.read_nonblock 2048
-		rescue Errno::EAGAIN; end
+	def initialize (min, max = nil, &block)
+		@min   = min
+		@max   = max || min
+		@block = block
 
-		IO.select([@awakenable.first], nil, nil, time)
-	end
+		@cond  = ConditionVariable.new
+		@mutex = Mutex.new
 
-	def wake_up
-		@awakenable ||= IO.pipe
+		@todo    = []
+		@workers = []
 
-		@awakenable.last.write 'x'
-	end
-end
+		@spawned       = 0
+		@waiting       = 0
+		@shutdown      = false
+		@trim_requests = 0
+		@auto_trim     = false
 
-class ThreadPool
-	class Worker
-		include Awakenable
-
-		def initialize (pool)
-			@pool  = pool
-			@mutex = Mutex.new
-
-			@thread = Thread.new {
-				loop do
-					if @block
-						begin
-							@block.call(*@args)
-						rescue Exception => e
-							@pool.raise(e)
-						end
+		@mutex.synchronize {
+			min.times {
+				spawn_thread
+			}
+		}
+	end
 
-						@block = nil
-						@args  = nil
+	def auto_trim?;    @auto_trim;         end
+	def auto_trim!;    @auto_trim = true;  end
+	def no_auto_trim!; @auto_trim = false; end
 
-						@pool.wake_up
-					else
-						sleep unless die?
-						break if die?
-					end
-				end
-			}
-		end
+	def resize (min, max = nil)
+		@min = min
+		@max = max || min
 
-		def available?
-			@mutex.synchronize {
-				!@block
-			}
-		end
+		trim!
+	end
 
-		def process (*args, &block)
-			return unless available?
+	def backlog
+		@mutex.synchronize {
+			@todo.length
+		}
+	end
 
-			@mutex.synchronize {
-				@block = block
-				@args  = args
+	def process (*args, &block)
+		@mutex.synchronize {
+			raise 'unable to add work while shutting down' if @shutdown
 
-				wake_up
-			}
-		end
+			@todo << [args, block]
 
-		def join
-			@thread.join
-		end
+			if @waiting == 0 && @spawned < @max
+				spawn_thread
+			end
 
-		def kill
-			return if die?
+			@cond.signal
+		}
+	end
 
-			@die = true
-			wake_up
-		end
+	alias << process
 
-		def die?
-			@die
-		end
+	def trim (force = false)
+		@mutex.synchronize {
+			if (force || @waiting > 0) && @spawned - @trim_requests > @min
+				@trim_requests -= 1
+				@cond.signal
+			end
+		}
+	end
 
-		def dead?
-			@thread.stop?
-		end
+	def trim!
+		trim true
 	end
 
-	extend Forwardable
+	def shutdown
+		@mutex.synchronize {
+			@shutdown = true
+			@cond.broadcast
+		}
+
+		@workers.first.join until @workers.empty?
+	end
 
-	attr_reader    :watcher, :size
-	def_delegators :@watcher, :sleep, :wake_up, :kill, :die?, :dead?, :join
-	def_delegators :@current, :raise
+private
+	def spawn_thread
+		@spawned += 1
 
-	def initialize (size = 2)
-		@size    = 0
-		@queue   = Queue.new
-		@pool    = []
-		@watcher = Worker.new(self)
-		@current = Thread.current
-		
-		@watcher.process {
+		thread = Thread.new {
 			loop do
-				sleep if @queue.empty?
-				next  if @queue.empty?
+				work     = nil
+				continue = true
 
-				begin
-					worker = @pool.find(&:available?) or sleep
-				end until worker
+				@mutex.synchronize {
+					while @todo.empty?
+						if @trim_requests > 0
+							@trim_requests -= 1
+							continue = false
 
-				break if die?
+							break
+						end
 
-				args, block = @queue.pop
+						if @shutdown
+							continue = false
 
-				worker.process(*args, &block)
-			end
+							break
+						end
 
-			@pool.each(&:kill)
-		}
+						@waiting += 1
+						@cond.wait @mutex
+						@waiting -= 1
 
-		resize(size)
-	end
+						if @shutdown
+							continue = false
 
-	def resize (size)
-		return if @size == size
+							break
+						end
+					end
 
-		if @size < size
-			1.upto(size - @size) {
-				@pool << Worker.new(self)
-			}
-		else
-			1.upto(@size - size) {
-				@pool.pop.kill
+					work = @todo.shift if continue
+				}
+
+				break unless continue
+
+				(work.last || @block).call(*work.first)
+
+				trim if auto_trim? && @spawned > @min
+			end
+
+			@mutex.synchronize {
+				@spawned -= 1
+				@workers.delete thread
 			}
-		end
+		}
 
-		@size = size
-	end
+		@workers << thread
 
-	def process (*args, &block)
-		@queue.push([args, block])
-		@watcher.wake_up
-	end; alias do process
+		thread
+	end
 end

data/threadpool.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new {|s|
 	s.name         = 'threadpool'
-	s.version      = '0.0.3'
+	s.version      = '0.1.0'
 	s.author       = 'meh.'
 	s.email        = 'meh@paranoici.org'
-	s.homepage     = 'http://github.com/meh/threadpool'
+	s.homepage     = 'http://github.com/meh/ruby-threadpool'
 	s.platform     = Gem::Platform::RUBY
 	s.summary      = 'A simple no-wasted-resources thread pool implementation.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threadpool
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org
@@ -20,7 +20,7 @@ files:
 - README.md
 - lib/threadpool.rb
 - threadpool.gemspec
-homepage: http://github.com/meh/threadpool
+homepage: http://github.com/meh/ruby-threadpool
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A simple no-wasted-resources thread pool implementation.