pipa-threadpool 0.2.1 → 0.2.2

data/README.rdoc

@@ -2,7 +2,7 @@
 O HAI! My name is Pool, Thread Pool. Now in Ruby.
 
 === Installation
-  gem install pipa-threadpool -s gems.github.com
+  gem install pipa-threadpool -s http://gems.github.com
 
 === Usage
   pool = ThreadPool.new
@@ -20,9 +20,8 @@ http://rdoc.info/projects/pipa/threadpool
 Please report via Github issue tracking.
 
 === See also
-http://github.com/pipa/monkeyjob -- Background job runner
-http://github.com/pipa/xmlnuts -- Ruby <-> XML mapping
-http://github.com/pipa/statelogic -- A simple state machine for ActiveRecord
+* http://github.com/pipa/xmlnuts -- Ruby <-> XML mapping
+* http://github.com/pipa/statelogic -- A simple state machine for ActiveRecord
 
 
 Free hint: If you liek mudkipz^W^Wfeel like generous today you can tip me at http://tipjoy.com/u/pisuka

data/lib/threadpool.rb

@@ -56,14 +56,8 @@ class ThreadPool
     @keep_alive_time = (args[2] || options[:keep_alive] || DEFAULT_KEEP_ALIVE_TIME).to_f
     raise ArgumentError, "keep_alive_time must be a non-negative real number" if @keep_alive_time < 0
 
-    @workers, @jobs = ThreadGroup.new, Queue.new
+    @workers, @jobs = [], Queue.new
 
-    @worker_routine = proc do
-      while job = @jobs.pop
-        job.run rescue nil
-      end
-    end
-    
     @controller = Thread.new do
       loop do
         sleep(@keep_alive_time)
@@ -128,9 +122,9 @@ class ThreadPool
     _sync do
       @dead = true
       @controller.run
-      stop_workers(@workers.list.size)
+      stop_workers(@workers.size)
     end
-    ThreadsWait.all_waits(@controller, *@workers.list)
+    ThreadsWait.all_waits(@controller, *@workers)
     self
   end
   
@@ -141,7 +135,7 @@ class ThreadPool
     _sync do
       @dead = true
       @controller.run
-      @workers.list.each {|w| w.kill }
+      @workers.each {|w| w.kill }
     end
     self
   end
@@ -152,7 +146,7 @@ class ThreadPool
     raise ArgumentError, 'block must be provided' unless block_given?
     _sync do
       if @jobs.num_waiting == 0
-        if @workers.list.size < @max_workers
+        if @workers.size < @max_workers
           create_worker
         else
           return nil unless enqueue
@@ -162,7 +156,7 @@ class ThreadPool
     end
     self
   end
-
+  
   def _sync #:nodoc:
     synchronize do
       check_state
@@ -175,7 +169,7 @@ class ThreadPool
   end
 
   def create_worker #:nodoc:
-    @workers.add(Thread.new(&@worker_routine))
+    @workers << Thread.new(&method(:worker_routine))
   end
 
   def create_workers(n) #:nodoc:
@@ -185,5 +179,13 @@ class ThreadPool
   def stop_workers(n) #:nodoc:
     n.times { @jobs << nil }
   end
+  
+  def worker_routine #:nodoc:
+    while job = @jobs.pop
+      job.run rescue nil
+    end
+  ensure
+    synchronize { @workers.delete(Thread.current) }
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-threadpool
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: []