bixby-common 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f917af6b0c09f9ac2c4b27040bf752ca4a83399f
-  data.tar.gz: 2d0e5e87a996acfa68e19cbe93e794cbc1ca4e8c
+  metadata.gz: 7ef49eaa3aea879b94f4ba4f77fe7e152044f415
+  data.tar.gz: 403008eee8f7dc8e787afceba4a9fe7696ad4b51
 SHA512:
-  metadata.gz: 60bf34b93f1ba0c9a306b7c6c86e88bbb20c951a2147804194285faf74beb35c7f4f06d0dc34094a0774c424e5bab17068ac3bef274d9f153959d8b536fee1c6
-  data.tar.gz: 3287f8e98887ae22ff62bad20c2eda2f2bee8fd2b7fd53c855ba7aae06bbb071fd18d1adc2a6d47e72df59762ef6fc456e15b465b74de2aa349e2b6d230d33e3
+  metadata.gz: 5eb86970763068ff7a08fb5f84cad02e910bf6a73e3e419f2c044827fea39e1a55aa69431983d264a65311dc7c8177ed2158d662ed874c4bed54134c735f0cba
+  data.tar.gz: c8dbaf3da89d7243b028c449665f454350f9ec3edb2c13b5252d961b08d60cca75bf857adce8c0e422080ca7a0384fe2cec450a8995afb0fca491ab5b615048a

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/bixby-common.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.6.2 ruby lib
+# stub: bixby-common 0.6.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/bixby-common/util/thread_pool.rb

@@ -32,7 +32,7 @@ module Bixby
       logger.debug { "enqueue new task: #{command}" }
       @input_queue.push(Task.new(command, block))
       if command == :perform then
-        grow_pool
+        grow
       end
       nil
     end
@@ -125,7 +125,6 @@ module Bixby
           end
 
           enqueue(:shutdown, callback)
-          @size -= 1
         end
       end
 
@@ -165,8 +164,8 @@ module Bixby
         exit_handler = lambda { |worker, reason|
           @lock.synchronize do
             if reason == :exception or (reason == :timeout && @size > @min_size) then
-              @size -= 1
               remove_worker(worker)
+              grow
               return true
             end
             false
@@ -179,13 +178,15 @@ module Bixby
     end
 
     # Grow the pool by one if we have more jobs than idle workers
-    def grow_pool
+    def grow
       @lock.synchronize do
+        prune
         logger.debug { "jobs: #{num_jobs}; busy: #{num_working}; idle: #{num_idle}" }
-        if @size < @max_size && num_jobs > 0 && num_jobs > num_idle then
+        if @size == 0 || (@size < @max_size && num_jobs > 0 && num_jobs > num_idle) then
           space = @max_size-@size
           jobs = num_jobs-num_idle
           needed = space < jobs ? space : jobs
+          needed = 1 if needed <= 0
           expand(needed)
         else
           logger.debug "NOT growing the pool!"
@@ -195,9 +196,19 @@ module Bixby
       nil
     end
 
+    # Remove any dead worker threads which may not have been cleaned up properly
+    # (via callback handler)
+    def prune
+      @lock.synchronize do
+        @workers.delete_if { |w| !w.alive? }
+        @size = @workers.size
+      end
+    end
+
     def remove_worker(worker)
       @lock.synchronize do
         @workers.delete(worker)
+        @size -= 1
       end
 
       nil

data/test/util/thread_pool_test.rb

@@ -2,6 +2,13 @@
 require 'helper'
 
 module Bixby
+
+  class ThreadPool
+    def workers
+      @workers
+    end
+  end
+
 module Test
 class TestThreadPool < TestCase
 
@@ -78,6 +85,40 @@ class TestThreadPool < TestCase
     assert_equal 1, @pool.size, "pool should shrink to 1"
   end
 
+  def test_handle_exception
+    @pool.perform do
+      raise "bleh"
+    end
+
+    while @pool.num_busy > 0 || @pool.num_jobs > 0 do
+      sleep 0.1
+    end
+
+    assert_equal 1, @pool.size
+    assert_equal 0, @pool.workers.find_all{ |w| !w.thread.alive? }.size, "no dead threads"
+  end
+
+  def test_handle_killed_thread
+    assert_equal 1, @pool.size
+    assert @pool.workers.find{ |w| w.thread.alive? }
+    @pool.workers.first.thread.kill
+    sleep 0.01
+    assert_equal 1, @pool.size
+    assert_equal 1, @pool.num_idle
+    refute @pool.workers.find{ |w| w.thread.alive? }
+
+    foo = []
+    @pool.perform do
+      foo << "bar"
+    end
+
+    @pool.dispose
+
+    @pool.summary
+    assert_equal 1, foo.size
+    assert_equal "bar", foo.first
+  end
+
 end # TestThreadPool
 end # Test
 end # Bixby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Chetan Sarva