e-threadpool 1.0.2 → 1.1.0

data/README.md

@@ -27,7 +27,7 @@ class TestJob < Job
   end
 end
 
-threadpool = Threadpool::Threadpool.new
+threadpool = Threadpool.new
 100.times.each do
   # threadpool auto-executes the job after loaded
   threadpool.load(TestJob.new)

data/lib/threadpool/core.rb

@@ -17,7 +17,7 @@ module Ethreadpool
       end
 
       @workers = (0...@init_workers).map { Threadpool::Worker.new }
-      Thread.new { process }
+      @checker_thread = Thread.new { run_checker }
     end
 
     def load(job)
@@ -30,6 +30,8 @@ module Ethreadpool
       loop do
         worker = idle_worker
         worker.nil? ? create_worker : break
+        
+        # sleep here is a must, or MRI will get stucks
         sleep(0.001)
       end
 
@@ -38,26 +40,19 @@ module Ethreadpool
 
     def shutdown
       @teminate = true
-
-      loop do
-        return if busy_workers.count == 0
-        sleep(0.001)
-      end
+      @checker_thread.join
     end
 
     private
-    def process
+    def run_checker
       loop do
         synchronize do
           @workers.each do |w|
-
-            if w.loaded? 
-              w.process
-
-              if Time.now - w.start_time > @timeout_secs
-                puts "job is timeout."
-                w.cancel
-              end
+            w.process
+            t = w.start_time
+            if t && (Time.now - t > @timeout_secs)
+              puts "job #{w.jobid} is timeout."
+              w.cancel
             end
 
           end

data/lib/threadpool/worker.rb

@@ -12,7 +12,7 @@ module Ethreadpool
     end
 
     def process
-      return if @start_time
+      return if @start_time || @job.nil?
       @start_time = Time.now
       @thread = Thread.new {
         @job.run 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e-threadpool
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: