thread 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd6eca648d0974faadfe04e24cbd3a696f386ba
-  data.tar.gz: f0e27ddf6ed2c9acb872667b3363bb309262aa08
+  metadata.gz: 3b410457cd8caaa3227527d9365650d3a02f8203
+  data.tar.gz: 0430247c137897d69e59a88a6f57943cd58f46d5
 SHA512:
-  metadata.gz: 4d08f22d5c16219d8829efd68ea170d526e8451c9e2b05f9132b4bfba365c72b4aaad07b517ae14080d13dd3c16e954066fa3d528ef2740566876758c7e17617
-  data.tar.gz: aede26e7afce41766aa3be0031880df21854a02f202cacf1b080754227152e3f6c17342e7374e79052eb2ca6195fe26ac915465fcaaf01c0572d1328dd532422
+  metadata.gz: c55851e31ce9cc4897006df956bb3e5cff13418e9a294f0168cfdcf36e1deb4ccdf51b3559c53a513ad8d63d6836c23374c46db4ae26e3f061a1089db55a1754
+  data.tar.gz: e91d1f1c0e483f2ed59bbe6966a1fd3604d2b8c082d6356e461d46233094c8d5c1415cf40b506ec22fd08027226af374d11a49621ebe0c74339021a5d7b857cc

data/lib/thread/pool.rb

@@ -189,46 +189,45 @@ class Thread::Pool
 		}
 	end
 
-	# Are all tasks consumed ?
+	# Are all tasks consumed?
 	def done?
 		@mutex.synchronize {
-			@todo.empty? and @waiting == @spawned
+			_done?
 		}
 	end
 
 	# Wait until all tasks are consumed. The caller will be blocked until then.
-	def wait_done
-		loop do
-			@done_mutex.synchronize {
-				return self if done?
-				@done.wait @done_mutex
-			}
+	def wait(what = :idle)
+		case what
+		when :done
+			loop do
+				@done_mutex.synchronize {
+					return self if _done?
+
+					@done.wait @done_mutex
+				}
+			end
+
+		when :idle
+			until idle?
+				@done_mutex.synchronize {
+					break if _idle?
+
+					@done.wait @done_mutex
+				}
+			end
 		end
+
+		self
 	end
 
 	# Check if there are idle workers.
 	def idle?
 		@mutex.synchronize {
-			@todo.length < @waiting
+			_idle?
 		}
 	end
 
-	# Process Block when there is a idle worker if not block its returns
-	def idle (*args, &block)
-		while !idle?
-			@done_mutex.synchronize {
-				break if idle?
-				@done.wait @done_mutex
-			}
-		end
-
-		unless block
-			return
-		end
-
-		process *args, &block
-	end
-
 	# Add a task to the pool which will execute the block with the given
 	# argument.
 	#
@@ -239,6 +238,14 @@ class Thread::Pool
 			raise ArgumentError, 'you must pass a block'
 		end
 
+		wait.process!(*args, &block)
+	end
+
+	def process! (*args, &block)
+		unless block || @block
+			raise ArgumentError, 'you must pass a block'
+		end
+
 		task = Task.new(self, *args, &(block || @block))
 
 		@mutex.synchronize {
@@ -256,7 +263,7 @@ class Thread::Pool
 		task
 	end
 
-	alias << process
+	alias << process!
 
 	# Trim the unused threads, if forced threads will be trimmed even if there
 	# are tasks waiting.
@@ -350,7 +357,7 @@ class Thread::Pool
 		attr_accessor :abort_on_exception
 	end
 
-	private
+private
 	def wake_up_timeout
 		if defined? @pipes
 			@pipes.last.write_nonblock 'x' rescue nil
@@ -375,7 +382,7 @@ class Thread::Pool
 
 							@waiting += 1
 
-							report_done
+							done!
 
 							if @idle_trim and @spawned > @min
 								check_time = Time.now + @idle_trim
@@ -447,9 +454,17 @@ class Thread::Pool
 		}
 	end
 
-	def report_done
+	def _done?
+		@todo.empty? and @waiting == @spawned
+	end
+
+	def _idle?
+		@todo.length < @waiting
+	end
+
+	def done!
 		@done_mutex.synchronize {
-			@done.broadcast if done? or idle?
+			@done.broadcast if _done? or _idle?
 		}
 	end
 end

data/thread.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "thread"
-  spec.version       = "0.1.6"
+  spec.version       = "0.1.7"
   spec.authors       = ["meh."]
   spec.email         = ["meh@schizofreni.co"]
   spec.summary       = %q{Various extensions to the base thread library.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec