threadpool 0.1.1 → 0.1.2

data/lib/threadpool.rb

@@ -162,13 +162,17 @@ class ThreadPool
 		trim true
 	end
 
-	def shutdown
+	def shutdown!
 		@mutex.synchronize {
 			@shutdown = true
 			@cond.broadcast
 		}
 
 		wake_up_timeout
+	end
+
+	def shutdown
+		shutdown!
 
 		join
 	end
@@ -215,42 +219,32 @@ private
 
 		thread = Thread.new {
 			loop do
-				task     = nil
-				continue = true
-
-				@mutex.synchronize {
-					while @todo.empty?
-						if @trim_requests > 0
-							@trim_requests -= 1
-							continue = false
-
-							break
-						end
+				task = @mutex.synchronize {
+					if @todo.empty?
+						while @todo.empty?
+							if @trim_requests > 0
+								@trim_requests -= 1
 
-						if shutdown?
-							continue = false
+								break
+							end
 
-							break
-						end
+							break if shutdown?
 
-						@waiting += 1
-						@cond.wait @mutex
-						@waiting -= 1
+							@waiting += 1
+							@cond.wait @mutex
+							@waiting -= 1
 
-						if shutdown?
-							continue = false
-
-							break
-						end
+							break !shutdown?
+						end or break
 					end
 
-					task = @todo.shift if continue
-				}
-
-				break if !continue || shutdown?
+					@todo.shift
+				} or break
 
 				task.execute(thread)
 
+				break if shutdown?
+
 				trim if auto_trim? && @spawned > @min
 			end
 
@@ -266,8 +260,7 @@ private
 	end
 	
 	def spawn_timeout_thread
-		@pipes = IO.pipe
-
+		@pipes   = IO.pipe
 		@timeout = Thread.new {
 			loop do
 				now     = Time.now

data/threadpool.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: threadpool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org