bixby-common 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d9095c479685b561505ef01da1e249db993eb3
-  data.tar.gz: 8626dfecd1da57efafb187bbba29210d98b0c69f
+  metadata.gz: 01cbdbfa0c13d2e8614a46e771ef0e9e16e21308
+  data.tar.gz: 6457c2b1f50b6569dbcc6cb97d9053e63ec01b80
 SHA512:
-  metadata.gz: e1596a2eb6dcdc5bb46f33ef6af1d63bb756de9f282aecaefe3beee59ef47b5be59111838fbfaf3f9aba057d5d8d27b0f85ba72a2571fefc1c0a80929447b06a
-  data.tar.gz: b103621dcd1b617491b8eafd5f4582c34b6a7a714dcc0b6abf21867a9a7904e3a4fc75e0df792752a32e830af51154ebbe19461da79b933fcdcb21e8601e8836
+  metadata.gz: 445c45438b177e91cde8c25b71f70ebc28fcff1fffa290a2247c5db3b952a3a68cb151d697dde0882684f6fe5eaeb943b9d696c44342e3a830dcd9070401b21c
+  data.tar.gz: bc88104b4157c8986d64078fa836c5acee5df142c7968474069b77d5e208ea855eed198e0b8ce93b3ea6da89b549f249a72cbba53e69822f3161c41cb15d3c51

data/Gemfile

@@ -12,17 +12,17 @@ gem "semver2", "~> 3.3"
 group :development do
   gem "yard", "~> 0.8"
   gem "bundler", "~> 1.1"
-  gem "jeweler", "~> 2.0", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"
+  gem "jeweler", "~> 2.0", :github => "chetan/jeweler", :branch => "bixby"
   gem "pry", "~> 0.9"
 
-  gem "test_guard", "~> 0.2", :git => "https://github.com/chetan/test_guard.git"
+  gem "test_guard", "~> 0.2", :github => "chetan/test_guard"
   gem 'rb-inotify', "~> 0.9", :require => false
   gem 'rb-fsevent', "~> 0.9", :require => false
   gem 'rb-fchange', "~> 0.0", :require => false
 end
 
 group :test do
-  gem "simplecov",  :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
+  gem "simplecov",  :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22], :github => "chetan/simplecov", :branch => "inline_nocov"
   gem "easycov",    :github => "chetan/easycov"
   gem "micron",     :github => "chetan/micron"
   gem "coveralls",  :require => false
@@ -36,11 +36,9 @@ group :test do
   # platform specific gemms
   # not sure we need to include these at all
   gem "json",         :platforms => [:mri, :jruby]
-  gem "oj",           :platforms => [:mri, :rbx]
-
-  gem "httpclient",   :platforms => [:jruby]
-  gem "curb",         :platforms => [:mri, :rbx]
+  gem "oj",           :platforms => [:ruby]
 
+  gem "httpclient",    :platforms => [:jruby]
   gem "jruby-openssl", :platforms => [:jruby]
 end
 

data/Gemfile.lock

@@ -9,16 +9,7 @@ GIT
       simplecov-html
 
 GIT
-  remote: git://github.com/chetan/micron.git
-  revision: 0c1e9c0b9d9e052805f43485fe3454cbd25913c5
-  specs:
-    micron (0.5.1)
-      ansi
-      easycov
-      hitimes
-
-GIT
-  remote: https://github.com/chetan/jeweler.git
+  remote: git://github.com/chetan/jeweler.git
   revision: b90381a3958daae7f3ce3d8c4d710fe39e72443b
   branch: bixby
   specs:
@@ -32,7 +23,16 @@ GIT
       rake
 
 GIT
-  remote: https://github.com/chetan/simplecov.git
+  remote: git://github.com/chetan/micron.git
+  revision: 0c1e9c0b9d9e052805f43485fe3454cbd25913c5
+  specs:
+    micron (0.5.1)
+      ansi
+      easycov
+      hitimes
+
+GIT
+  remote: git://github.com/chetan/simplecov.git
   revision: 308449b2193700f7a9a4291821a323110838fbc0
   branch: inline_nocov
   specs:
@@ -41,7 +41,7 @@ GIT
       simplecov-html (~> 0.7.1)
 
 GIT
-  remote: https://github.com/chetan/test_guard.git
+  remote: git://github.com/chetan/test_guard.git
   revision: 178e47e2e57dc83060d6cabc18f206916b9d02f2
   specs:
     test_guard (0.2.1)
@@ -57,56 +57,55 @@ GEM
   specs:
     addressable (2.3.6)
     ansi (1.4.3)
-    awesome_print (1.2.0)
-    bixby-auth (0.1.0)
+    awesome_print (1.6.1)
+    bixby-auth (0.1.1)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    colorize (0.7.3)
-    coveralls (0.7.1)
+    colorize (0.7.5)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    curb (0.8.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    eventmachine (1.0.3)
-    eventmachine (1.0.3-java)
-    faraday (0.9.0)
+    eventmachine (1.0.4)
+    eventmachine (1.0.4-java)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    faye-websocket (0.7.4)
+    faye-websocket (0.9.2)
       eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.3.1)
-    ffi (1.9.5)
-    ffi (1.9.5-java)
-    git (1.2.8)
-    github_api (0.12.1)
+      websocket-driver (>= 0.5.1)
+    ffi (1.9.6)
+    ffi (1.9.6-java)
+    git (1.2.9.1)
+    github_api (0.12.2)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
     growl (1.0.3)
-    hashie (3.3.1)
+    hashie (3.3.2)
     highline (1.6.21)
     hirb (0.7.2)
     hitimes (1.2.2)
     hitimes (1.2.2-java)
-    httpclient (2.4.0)
-    httpi (2.2.7)
+    httpclient (2.6.0.1)
+    httpi (2.3.0)
       rack
-    jruby-openssl (0.9.5-java)
-    json (1.8.1)
-    json (1.8.1-java)
-    jwt (1.0.0)
-    listen (2.7.11)
+    jruby-openssl (0.9.6-java)
+    json (1.8.2)
+    json (1.8.2-java)
+    jwt (1.2.0)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -116,25 +115,24 @@ GEM
       multi_json (>= 1.8.4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    mixlib-shellout (1.4.0)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    mixlib-shellout (2.0.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    netrc (0.7.7)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nokogiri (1.6.3.1-java)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.5-java)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.10.2)
+    oj (2.11.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -144,18 +142,17 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     safe_yaml (1.0.4)
-    semver2 (3.4.0)
+    semver2 (3.4.1)
     simplecov-console (0.2.0)
       colorize
       hirb
@@ -164,20 +161,23 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
     thread_safe (0.3.4)
     thread_safe (0.3.4-java)
     timers (4.0.1)
       hitimes
-    tins (1.3.3)
-    webmock (1.19.0)
+    tins (0.13.2)
+    webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.4)
-    websocket-driver (0.3.4-java)
-    yard (0.8.7.4)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.5.1-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   java
@@ -187,7 +187,6 @@ DEPENDENCIES
   bixby-auth (~> 0.1)
   bundler (~> 1.1)
   coveralls
-  curb
   easycov!
   faye-websocket (~> 0.7)
   httpclient

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/bixby-common.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.5.0 ruby lib
+# stub: bixby-common 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Chetan Sarva"]
-  s.date = "2014-11-20"
+  s.date = "2015-01-16"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.extra_rdoc_files = [
@@ -50,6 +50,11 @@ Gem::Specification.new do |s|
     "lib/bixby-common/util/log.rb",
     "lib/bixby-common/util/log/filtering_layout.rb",
     "lib/bixby-common/util/log/logger.rb",
+    "lib/bixby-common/util/signal.rb",
+    "lib/bixby-common/util/thread_dump.rb",
+    "lib/bixby-common/util/thread_pool.rb",
+    "lib/bixby-common/util/thread_pool/task.rb",
+    "lib/bixby-common/util/thread_pool/worker.rb",
     "lib/bixby-common/websocket/api_channel.rb",
     "lib/bixby-common/websocket/async_response.rb",
     "lib/bixby-common/websocket/message.rb",
@@ -72,6 +77,7 @@ Gem::Specification.new do |s|
     "test/util/http_client_test.rb",
     "test/util/jsonify_test.rb",
     "test/util/log_test.rb",
+    "test/util/thread_pool_test.rb",
     "test/websocket/api_channel_test.rb",
     "test/websocket/async_response_test.rb",
     "test/websocket/request_test.rb",

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

@@ -0,0 +1,32 @@
+
+module Bixby
+  module Signal
+
+    # Helper for trapping signals and handling them via a dedicated thread
+    #
+    # @param [String] *signals         Signals to trap either as a space-separate string or array
+    # @param [Block] block             Callback when signal is trapped
+    #
+    # @return [Thread]
+    def self.trap(*signals, &block)
+      sigs = signals.flatten.map{ |s| s.split(/[\s,]/) }.flatten.sort.uniq
+
+      trap_r, trap_w = IO.pipe
+      sigs.each do |sig|
+        Kernel.trap(sig) do
+          trap_w.puts(sig)
+        end
+      end
+
+      # handle signals from a dedicated thread
+      Thread.new do
+        while true
+          sig = trap_r.readline.strip
+          block.call(sig)
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,73 @@
+
+module Bixby
+  module ThreadDump
+
+    class LoggerIO
+      def initialize(logger)
+        @logger = logger
+      end
+      def puts(str="")
+        @logger.warn(str)
+      end
+    end
+
+    class << self
+
+      # Prints a thread dump on ALRM signal
+      # kill -ALRM <pid>
+      def trap!
+        t = Bixby::Signal.trap("SIGALRM") do
+          write(LoggerIO.new(Logging.logger[ThreadDump]))
+        end
+        t[:_name] = "dumper [ignore me]"
+
+        Logging.logger[ThreadDump].info "Trapping SIGALRM: kill -ALRM #{Process.pid}"
+      end
+
+      # Write thread dump to the given IO-like handle (must respond to #puts)
+      #
+      # @param [IO] io
+      def write(io=STDERR)
+        out = []
+        out << "=== thread dump for #{$0} (pid=#{Process.pid}): #{Time.now} ==="
+        out << ""
+
+        Thread.list.each do |thread|
+
+          # compute thread name, filling in some common libraries
+          n = thread.inspect
+          if thread.key?(:_name) then
+            n += " #{thread[:_name]}"
+          else
+            t = thread.backtrace.first.strip
+            if t =~ %r{rack/handler/puma.rb:.*`join'} then
+              n += " puma daemon thread"
+            elsif t =~ %r{puma/reactor.rb:.*`select'} then
+              n += " puma runloop"
+            elsif t =~ %r{puma/server.rb:.*`select'} then
+              n += " puma i/o runloop"
+            elsif t =~ %r{puma/thread_pool.rb:.*`sleep'} then
+              n += " puma threadpool cleanup"
+            elsif t =~ %r{lib/eventmachine.rb:.*`run_machine'} then
+              n += " EventMachine runloop"
+            elsif t =~ %r{celluloid/mailbox.rb:.*`sleep'} then
+              n += " celluloid actor thread"
+            elsif t =~ %r{bixby-common/util/thread_pool/worker.rb:.*} then
+              state = (t =~ /`pop'/ ? "idle" : "busy")
+              n += " Bixby::ThreadPool::Worker thread, #{state}"
+            end
+          end
+
+          out << n
+          out << "  " + thread.backtrace.join("\n    \\_ ")
+          out << "-"
+          out << ""
+        end
+        out << "=== end thread dump ==="
+
+        io.puts out.join("\n")
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+
+module Bixby
+  class ThreadPool
+    class Task
+
+      attr_accessor :command, :block
+
+      def initialize(command, block=nil)
+        @command = command
+        @block   = block
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+
+require "timeout"
+
+module Bixby
+  class ThreadPool
+    class Worker
+
+      include Bixby::Log
+
+      attr_reader :thread
+
+      def initialize(queue, idle_timeout, exit_handler)
+        @input_queue = queue
+        @idle_timeout = idle_timeout
+        @exit_handler = exit_handler
+        @running = true
+        @working = false
+        @thread = Thread.new { start_run_loop }
+      end
+
+      def join(max_wait = nil)
+        raise "Worker can't join itself." if @thread == Thread.current
+
+        return true if @thread.nil? || !@thread.join(max_wait).nil?
+
+        @thread.kill and return false
+      end
+
+      def alive?
+        return @running && @thread && @thread.alive?
+      end
+
+      def working?
+        @working
+      end
+
+      def inspect
+        return "#<#{self.class.to_s}:0x#{(object_id << 1).to_s(16)} #{alive? ? 'alive' : 'dead'}>"
+      end
+
+      def to_s
+        inspect
+      end
+
+
+      private
+
+      def start_run_loop
+        begin
+
+          while true
+
+            task = nil
+            Timeout::timeout(@idle_timeout) {
+              task = @input_queue.pop
+            }
+
+            case task.command
+              when :shutdown
+                # logger.debug "#{inspect} thread shutting down"
+                task.block.call(self) if task.block
+                @running = false
+                @thread = nil
+                return nil
+              when :perform
+                @working = true
+                # logger.debug "#{inspect} got work"
+                task.block.call if task.block
+                @working = false
+            end
+          end
+
+        rescue Timeout::Error => ex
+          if @exit_handler.call(self, :timeout) then
+            # true result means we should exit
+            # logger.debug "worker exiting due to idle timeout (#{@idle_timeout} sec)"
+            @running = false
+            return
+          end
+
+        rescue Exception => e
+          @running = false
+          logger.error "Worker runloop died: #{e.message}\n" + e.backtrace.join("\n")
+          @exit_handler.call(self, :exception)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,203 @@
+
+# ThreadPool implementation based on MIT-licensed `workers` gem, v0.2.2, Copyright (c) 2013 Chad Remesch
+
+require "bixby-common/util/thread_pool/task"
+require "bixby-common/util/thread_pool/worker"
+
+require "thread"
+require "monitor"
+
+module Bixby
+  class ThreadPool
+
+    DEFAULT_MIN = 1
+    DEFAULT_MAX = 8
+    DEFAULT_IDLE_TIMEOUT = 60
+
+    include Bixby::Log
+
+    def initialize(options = {})
+      @input_queue = Queue.new
+      @lock = Monitor.new
+      @workers = []
+      @min_size = options[:min_size] || DEFAULT_MIN
+      @max_size = options[:max_size] || DEFAULT_MAX
+      @idle_timeout = options[:idle_timeout] || DEFAULT_IDLE_TIMEOUT
+      @size = 0
+
+      expand(@min_size)
+    end
+
+    def enqueue(command, block=nil)
+      @input_queue.push(Task.new(command, block))
+      if command == :perform then
+        grow_pool
+      end
+      nil
+    end
+
+    def perform(&block)
+      enqueue(:perform, block)
+      nil
+    end
+
+    def <<(proc)
+      enqueue(:perform, block)
+      nil
+    end
+
+    def num_jobs
+      @input_queue.size
+    end
+
+    def num_idle
+      @size - num_busy
+    end
+
+    def num_busy
+      @lock.synchronize do
+        return @workers.find_all{ |w| w.working? }.size
+      end
+    end
+    alias_method :num_working, :num_busy
+
+    def shutdown(&block)
+      @lock.synchronize do
+        @size.times do
+          enqueue(:shutdown, block)
+        end
+      end
+
+      nil
+    end
+
+    def join(max_wait = nil)
+      results = @workers.map { |w| w.join(max_wait) }
+      @workers.clear
+      @size = 0
+
+      return results
+    end
+
+    def dispose
+      @lock.synchronize do
+        shutdown
+        join
+      end
+
+      nil
+    end
+
+    def inspect
+      "#<#{self.class.to_s}:0x#{(object_id << 1).to_s(16)} threads=#{size} jobs=#{num_jobs}>"
+    end
+
+    def to_s
+      inspect
+    end
+
+    def size
+      @lock.synchronize do
+        return @size
+      end
+    end
+
+    def expand(count)
+      @lock.synchronize do
+        # logger.debug "expanding by #{count} threads (from #{@size})"
+        count.times do
+          create_worker
+        end
+      end
+
+      nil
+    end
+
+    def contract(count, &block)
+      @lock.synchronize do
+        raise 'Count is too large.' if count > @size
+
+        count.times do
+          callback = Proc.new do |worker|
+            remove_worker(worker)
+            block.call if block
+          end
+
+          enqueue(:shutdown, callback)
+          @size -= 1
+        end
+      end
+
+      nil
+    end
+
+    def resize(new_size)
+      @lock.synchronize do
+        if new_size > @size
+          expand(new_size - @size)
+        elsif new_size < @size
+          contract(@size - new_size)
+        end
+      end
+
+      nil
+    end
+
+    # For debugging
+    def summary
+      @lock.synchronize do
+        puts "jobs: #{@input_queue.size}"
+        puts "workers: #{@workers.size}"
+        @workers.each do |w|
+          puts "  " + w.thread.inspect
+        end
+      end
+    end
+
+
+    private
+
+    def create_worker
+      @lock.synchronize do
+        # logger.debug "spawning new worker thread"
+
+        exit_handler = lambda { |worker, reason|
+          @lock.synchronize do
+            if reason == :exception or (reason == :timeout && @size > @min_size) then
+              @size -= 1
+              remove_worker(worker)
+              return true
+            end
+            false
+          end
+        }
+
+        @workers << Worker.new(@input_queue, @idle_timeout, exit_handler)
+        @size += 1
+      end
+    end
+
+    # Grow the pool by one if we have more jobs than idle workers
+    def grow_pool
+      @lock.synchronize do
+        # logger.debug { "busy: #{num_working}; idle: #{num_idle}" }
+        if @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
+          expand(needed)
+        end
+      end
+
+      nil
+    end
+
+    def remove_worker(worker)
+      @lock.synchronize do
+        @workers.delete(worker)
+      end
+
+      nil
+    end
+  end
+end

data/lib/bixby-common/websocket/api_channel.rb

@@ -15,11 +15,12 @@ module Bixby
 
       attr_reader :ws
 
-      def initialize(ws, handler)
+      def initialize(ws, handler, thread_pool)
         @ws = ws
         @handler = handler
         @responses = {}
         @connected = false
+        @thread_pool = thread_pool
       end
 
       # Perform RPC
@@ -96,10 +97,13 @@ module Bixby
 
         if req.type == "rpc" then
           # Execute the requested method and return the result
-          json_req = req.json_request
-          logger.debug { "RPC request\n#{json_req}" }
-          json_response = @handler.new(req).handle(json_req)
-          ws.send(Response.new(json_response, req.id).to_wire)
+          # Do it asynchronously so as not to hold up the EM-loop while the command is running
+          @thread_pool.perform do
+            json_req = req.json_request
+            logger.debug { "RPC request\n#{json_req}" }
+            json_response = @handler.new(req).handle(json_req)
+            EM.next_tick { ws.send(Response.new(json_response, req.id).to_wire) }
+          end
 
         elsif req.type == "rpc_result" then
           # Pass the result back to the caller
@@ -108,6 +112,8 @@ module Bixby
           @responses[req.id].response = res
 
         elsif req.type == "connect" then
+          # Agent request to CONNECT to the manager
+          # will only be received by the server-end of the channel
           logger.debug { "CONNECT request #{req.id}"}
           ret = @handler.new(req).connect(req.json_request, self)
           if ret.kind_of? JsonResponse then

data/lib/bixby-common/websocket/async_response.rb

@@ -34,7 +34,7 @@ module Bixby
         @mutex.synchronize {
           @response = obj
           @completed = true
-          @cond.signal
+          @cond.broadcast
         }
 
         if not @block.nil? then
@@ -53,8 +53,11 @@ module Bixby
       #
       # @return [Object] response data
       def response
-        return @response if @completed
-        @mutex.synchronize { @cond.wait(@mutex) }
+        @mutex.synchronize {
+          if !@completed then
+            @cond.wait(@mutex)
+          end
+        }
         return @response
       end
 

data/lib/bixby-common.rb

@@ -33,5 +33,8 @@ module Bixby
   autoload :Hashify, "bixby-common/util/hashify"
   autoload :Log, "bixby-common/util/log"
   autoload :Debug, "bixby-common/util/debug"
+  autoload :Signal, "bixby-common/util/signal"
+  autoload :ThreadDump, "bixby-common/util/thread_dump"
+  autoload :ThreadPool, "bixby-common/util/thread_pool"
 
 end

data/test/base.rb

@@ -1,7 +1,13 @@
 
+require 'micron/test_case/redir_logging'
+
 module Bixby
   module Test
-    class TestCase < MiniTest::Unit::TestCase
+    class TestCase < Micron::TestCase
+
+      include Bixby::Log
+      include Micron::TestCase::RedirLogging
+      self.redir_logger = Logging.logger[Bixby]
 
       def setup
         ENV["BIXBY_HOME"] = File.join(File.expand_path(File.dirname(__FILE__)), "support")

data/test/util/thread_pool_test.rb

@@ -0,0 +1,80 @@
+
+require 'helper'
+
+module Bixby
+module Test
+class TestThreadPool < TestCase
+
+  def setup
+    @pool = Bixby::ThreadPool.new(:idle_timeout => 1)
+    assert_equal 1, @pool.size
+    assert_equal 2, Thread.list.size
+  end
+
+  def teardown
+    begin
+      puts "tearing down, shutting down pool"
+      @pool.shutdown
+      @pool.join(5)
+      assert_equal 0, @pool.size
+    rescue Exception => ex
+    end
+  end
+
+  def test_simple_job
+    foo = []
+    @pool.perform do
+      foo << :bar
+    end
+
+    @pool.dispose
+    logger.debug "pool disposed, joined"
+
+    @pool.summary
+
+    assert_equal 0, @pool.num_jobs, "no jobs left"
+    assert_equal 1, foo.size
+    assert_equal :bar, foo.first
+  end
+
+  def test_pool_grows_to_max
+    foo = []
+    4.times do |i|
+      @pool.perform do
+        foo << "thread #{i}"
+      end
+    end
+    assert_equal 4, @pool.size
+
+    10.times do |i|
+      @pool.perform do
+        foo << "thread #{i}"
+      end
+    end
+    assert_equal 8, @pool.size
+
+    @pool.dispose
+    assert_equal 14, foo.size
+  end
+
+  def test_pool_shrinks_on_idle
+    foo = []
+    2.times do |i|
+      @pool.perform do
+        foo << "thread #{i}"
+      end
+    end
+    assert_equal 2, @pool.size, "pool should grow to 2"
+
+    while @pool.num_busy > 0 do
+      sleep 0.1
+    end
+    sleep 1.1
+
+    logger.debug "shrank yet?!"
+    assert_equal 1, @pool.size, "pool should shrink to 1"
+  end
+
+end # TestThreadPool
+end # Test
+end # Bixby

data/test/websocket/api_channel_test.rb

@@ -22,7 +22,12 @@ class TestAPIChannel < TestCase
   def setup
     @em_thread = Thread.new { EM.run{} }
     @ws = mock("websocket")
-    @api_chan = Bixby::WebSocket::APIChannel.new(ws, SampleHandler)
+    @thread_pool = Bixby::ThreadPool.new
+    @api_chan = Bixby::WebSocket::APIChannel.new(ws, SampleHandler, @thread_pool)
+  end
+
+  def teardown
+    @thread_pool.dispose
   end
 
   def test_open
@@ -56,6 +61,13 @@ class TestAPIChannel < TestCase
       !res.nil? && res.json_response.to_wire == json_res.to_wire
     }
     api_chan.message(event)
+
+    # wait for jobs to finish and cleanup
+    @thread_pool.dispose
+    sleep 0.05
+    while !EM.defers_finished? do
+      sleep 0.01
+    end
   end
 
   def test_message_response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-auth
@@ -245,6 +245,11 @@ files:
 - lib/bixby-common/util/log.rb
 - lib/bixby-common/util/log/filtering_layout.rb
 - lib/bixby-common/util/log/logger.rb
+- lib/bixby-common/util/signal.rb
+- lib/bixby-common/util/thread_dump.rb
+- lib/bixby-common/util/thread_pool.rb
+- lib/bixby-common/util/thread_pool/task.rb
+- lib/bixby-common/util/thread_pool/worker.rb
 - lib/bixby-common/websocket/api_channel.rb
 - lib/bixby-common/websocket/async_response.rb
 - lib/bixby-common/websocket/message.rb
@@ -267,6 +272,7 @@ files:
 - test/util/http_client_test.rb
 - test/util/jsonify_test.rb
 - test/util/log_test.rb
+- test/util/thread_pool_test.rb
 - test/websocket/api_channel_test.rb
 - test/websocket/async_response_test.rb
 - test/websocket/request_test.rb