thread 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d257856d0bf60a4515f3512f44e1ca7f72ac22c
-  data.tar.gz: 99094a0eff5d5e031230d872a67f30730d025730
+  metadata.gz: 136683911f76264b8d9c47d66607cd3d5b2d9d34
+  data.tar.gz: 8e669b7e1cad8f10467f45c56b0e7887b51ab9d8
 SHA512:
-  metadata.gz: dbe9b316f2bdd6b3c141180de8be77bd8a62ffa2ddfee531a6f63bc39bcc3b0ca263688037549c6b3c479a55f4ab710112871da4ed3f4e7070fd8eab6e8ee622
-  data.tar.gz: ac27c137c50fdc797ca56a0ebf6d2578634dcc86d007959fc3f55bf2ad0ba5f2d4715c04e1bb9de3f3134cab47efb18091e7571bdb661c049cf90ecd934d1521
+  metadata.gz: 657218c2a64a1ef1e5593a6b73d3f29abe376d6c31757220aed94bb742abcd2aa0c743c9dfe1aa168839c0d9d547d01361ddea351db206c6b8a1d140fc53a316
+  data.tar.gz: b2546abceef43fd444a6acfb950abae2c5c164cab5bd4733b1296fa836ee7dde616fa80af86856f643a4d485363428b61dbaebecfb53e7acdfc9b7dadf03d4ee

data/lib/thread/pool.rb

@@ -117,6 +117,9 @@ class Thread::Pool
 		@cond  = ConditionVariable.new
 		@mutex = Mutex.new
 
+		@done       = ConditionVariable.new
+		@done_mutex = Mutex.new
+
 		@todo     = []
 		@workers  = []
 		@timeouts = {}
@@ -126,6 +129,7 @@ class Thread::Pool
 		@shutdown      = false
 		@trim_requests = 0
 		@auto_trim     = false
+		@idle_trim     = nil
 
 		@mutex.synchronize {
 			min.times {
@@ -153,6 +157,22 @@ class Thread::Pool
 		@auto_trim = false
 	end
 
+	# Check if idle trimming is enabled.
+	def idle_trim?
+		!@idle_trim.nil?
+	end
+
+	# Enable idle trimming. Unneeded threads will be deleted after the given number of seconds of inactivity.
+	# The minimum number of threads is respeced.
+	def idle_trim!(timeout)
+		@idle_trim = timeout
+	end
+
+	# Turn of idle trimming.
+	def no_idle_trim!
+		@idle_trim = nil
+	end
+
 	# Resize the pool with the passed arguments.
 	def resize (min, max = nil)
 		@min = min
@@ -168,6 +188,19 @@ class Thread::Pool
 		}
 	end
 
+	# Are all tasks consumed ?
+	def done?
+		@todo.empty? and @waiting == @spawned
+	end
+
+	# Wait until all tasks are consumed. The caller will be blocked until then.
+	def wait_done
+		@done_mutex.synchronize {
+			return if done?
+			@done.wait @done_mutex
+		}
+	end
+
 	# Add a task to the pool which will execute the block with the given
 	# argument.
 	#
@@ -202,7 +235,7 @@ class Thread::Pool
 	def trim (force = false)
 		@mutex.synchronize {
 			if (force || @waiting > 0) && @spawned - @trim_requests > @min
-				@trim_requests -= 1
+				@trim_requests += 1
 				@cond.signal
 			end
 		}
@@ -306,7 +339,17 @@ private
 							break if shutdown?
 
 							@waiting += 1
-							@cond.wait @mutex
+
+							report_done
+
+							if @idle_trim and @spawned > @min
+								check_time = Time.now + @idle_trim
+								@cond.wait @mutex, @idle_trim
+								@trim_requests += 1 if Time.now >= check_time && @spawned - @trim_requests > @min
+							else
+								@cond.wait @mutex
+							end
+
 							@waiting -= 1
 						end
 
@@ -368,6 +411,13 @@ private
 			end
 		}
 	end
+
+	def report_done
+		@done_mutex.synchronize {
+			@done.broadcast if done?
+		}
+	end
+
 end
 
 class Thread

data/thread.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'thread'
-	s.version      = '0.0.8.1'
+	s.version      = '0.1.0'
 	s.author       = 'meh.'
 	s.email        = 'meh@schizofreni.co'
 	s.homepage     = 'http://github.com/meh/ruby-thread'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.1.0
 platform: ruby
 authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Various extensions to the base thread library.