hot_bunnies 2.0.0.pre10-java → 2.0.0.pre11-java

data/lib/hot_bunnies/channel.rb

@@ -118,17 +118,18 @@ module HotBunnies
     attr_reader :consumers
 
     # @private
-    def initialize(session, delegate)
+    def initialize(session, delegate, thread_pool)
       @connection = session
       @delegate   = delegate
+      @thread_pool = thread_pool
 
-      @exchanges      = ConcurrentHashMap.new
-      @queues         = ConcurrentHashMap.new
+      @exchanges      = JavaConcurrent::ConcurrentHashMap.new
+      @queues         = JavaConcurrent::ConcurrentHashMap.new
       # we keep track of consumers in part to gracefully shut down their
       # executors when the channel is closed. This frees library users
       # from having to worry about this. MK.
-      @consumers      = ConcurrentHashMap.new
-      @shutdown_hooks = ConcurrentSkipListSet.new
+      @consumers      = JavaConcurrent::ConcurrentHashMap.new
+      @shutdown_hooks = JavaConcurrent::ConcurrentSkipListSet.new
       @recoveries_counter = JavaConcurrent::AtomicInteger.new(0)
 
       on_shutdown do |ch, cause|
@@ -136,35 +137,19 @@ module HotBunnies
       end
     end
 
-    # @return [HotBunnies::Session] Connection this channel is on
-    def client
-      @connection
-    end
-
     # @return [HotBunnies::Session] Connection this channel is on
     def session
       @connection
     end
-
-    # @return [HotBunnies::Session] Connection this channel is on
-    def connection
-      @connection
-    end
-
-    # @return [Integer] Channel id
-    def id
-      @delegate.channel_number
-    end
-
-    # @return [Integer] Channel id
-    def number
-      @delegate.channel_number
-    end
+    alias client session
+    alias connection session
 
     # @return [Integer] Channel id
     def channel_number
       @delegate.channel_number
     end
+    alias id channel_number
+    alias number channel_number
 
     # Closes the channel.
     #
@@ -418,7 +403,7 @@ module HotBunnies
     # @see http://hotbunnies.info/articles/extensions.html RabbitMQ Extensions guide
     # @api public
     def queue(name, options={})
-      dq = Queue.new(self, name, options).tap do |q|
+      dq = Queue.new(self, name, @thread_pool, options).tap do |q|
         q.declare!
       end
 

data/lib/hot_bunnies/consumers.rb

@@ -1,5 +1,4 @@
 require "hot_bunnies/thread_pools"
 
 require "hot_bunnies/consumers/base"
-require "hot_bunnies/consumers/non_blocking"
 require "hot_bunnies/consumers/blocking"

data/lib/hot_bunnies/consumers/base.rb

@@ -5,10 +5,11 @@ module HotBunnies
     attr_accessor :consumer_tag
     attr_accessor :auto_ack
 
-    def initialize(channel, queue)
+    def initialize(channel, queue, opts)
       super(channel)
       @channel    = channel
       @queue      = queue
+      @opts       = opts
       @auto_ack   = true
 
       @cancelling = JavaConcurrent::AtomicBoolean.new
@@ -54,6 +55,11 @@ module HotBunnies
     end
 
     def start
+      # no-op
+    end
+
+    def gracefully_shut_down
+      # no-op
     end
 
     def deliver(headers, message)
@@ -74,12 +80,33 @@ module HotBunnies
 
     # @private
     def recover_from_network_failure
-      @consumer_tag = @channel.basic_consume(@queue.name, @auto_ack, self)
-
       @terminated.set(false)
       @cancelled.set(false)
+      @consumer_tag = @channel.basic_consume(@queue.name, @auto_ack, self)
 
       @consumer_tag
     end
   end
+
+  class CallbackConsumer < BaseConsumer
+    def initialize(channel, queue, opts, callback)
+      raise ArgumentError, "callback must not be nil!" if callback.nil?
+
+      super(channel, queue, opts)
+      @callback = callback
+      @callback_arity = @callback.arity
+    end
+
+    def deliver(headers, message)
+      if @callback_arity == 2
+        @callback.call(headers, message)
+      else
+        @callback.call(message)
+      end
+    end
+
+    def cancel
+      @channel.basic_cancel(consumer_tag)
+    end
+  end
 end

data/lib/hot_bunnies/consumers/blocking.rb

@@ -2,19 +2,15 @@ require "hot_bunnies/consumers/base"
 
 module HotBunnies
   class BlockingCallbackConsumer < CallbackConsumer
-    include JavaConcurrent
-
     POISON = :__poison__
 
     def initialize(channel, queue, buffer_size, opts, callback)
-      super(channel, queue, callback)
+      super(channel, queue, opts, callback)
       if buffer_size
-        @internal_queue = ArrayBlockingQueue.new(buffer_size)
+        @internal_queue = JavaConcurrent::ArrayBlockingQueue.new(buffer_size)
       else
-        @internal_queue = LinkedBlockingQueue.new
+        @internal_queue = JavaConcurrent::LinkedBlockingQueue.new
       end
-
-      @opts = opts
     end
 
     def cancel
@@ -37,10 +33,10 @@ module HotBunnies
             if pair == POISON
               @cancelling.set(true)
             else
-              callback(*pair)
+              @callback.call(*pair)
             end
           end
-        rescue InterruptedException => e
+        rescue JavaConcurrent::InterruptedException => e
           interrupted = true
         end
       end
@@ -49,7 +45,7 @@ module HotBunnies
           if pair == POISON
             @cancelling.set(true)
           else
-            callback(*pair)
+            @callback.call(*pair)
           end
         end
       end
@@ -65,7 +61,7 @@ module HotBunnies
       else
         begin
           @internal_queue.put(pair)
-        rescue InterruptedException => e
+        rescue JavaConcurrent::InterruptedException => e
           JavaConcurrent::Thread.current_thread.interrupt
         end
       end

data/lib/hot_bunnies/juc.rb

@@ -1,11 +1,9 @@
-module JavaConcurrent
-  java_import 'java.lang.Thread'
-  java_import 'java.lang.Runnable'
-  java_import 'java.lang.InterruptedException'
-  java_import 'java.util.concurrent.Executors'
-  java_import 'java.util.concurrent.LinkedBlockingQueue'
-  java_import 'java.util.concurrent.ArrayBlockingQueue'
-  java_import 'java.util.concurrent.TimeUnit'
-  java_import 'java.util.concurrent.atomic.AtomicBoolean'
-  java_import 'java.util.concurrent.atomic.AtomicInteger'
-end
+module HotBunnies
+  module JavaConcurrent
+    java_import 'java.lang.Thread'
+    java_import 'java.lang.Runnable'
+    java_import 'java.lang.InterruptedException'
+    include_package 'java.util.concurrent'
+    include_package 'java.util.concurrent.atomic'
+  end
+end

data/lib/hot_bunnies/queue.rb

@@ -29,9 +29,10 @@ module HotBunnies
     # @see http://hotbunnies.info/articles/queues.html Queues and Consumers guide
     # @see http://hotbunnies.info/articles/extensions.html RabbitMQ Extensions guide
     # @api public
-    def initialize(channel, name, options={})
+    def initialize(channel, name, thread_pool, options={})
       @channel = channel
       @name = name
+      @thread_pool = thread_pool
       @options = {:durable => false, :exclusive => false, :auto_delete => false, :passive => false, :arguments => Hash.new}.merge(options)
 
       @durable      = @options[:durable]
@@ -158,29 +159,16 @@ module HotBunnies
     end
     alias pop get
 
-    def build_consumer(opts, &block)
+    def build_consumer(opts = {}, &block)
       if opts[:block] || opts[:blocking]
         BlockingCallbackConsumer.new(@channel, self, opts[:buffer_size], opts, block)
       else
-        esf = opts.fetch(:executor_factory, Proc.new {
-          JavaConcurrent::Executors.new_single_thread_executor
-        })
-        es  = opts.fetch(:executor, esf.call)
-        AsyncCallbackConsumer.new(@channel, self, opts.merge(:executor => es, :executor_factory => esf), block)
+        CallbackConsumer.new(@channel, self, opts, block)
       end
     end
 
     def subscribe(opts = {}, &block)
-      consumer = build_consumer(opts, &block)
-
-      @consumer_tag     = @channel.basic_consume(@name, !(opts[:ack] || opts[:manual_ack]), consumer)
-      consumer.consumer_tag = @consumer_tag
-
-      @default_consumer = consumer
-      @channel.register_consumer(@consumer_tag, consumer)
-      consumer.start
-
-      consumer
+      subscribe_with(build_consumer(opts, &block))
     end
 
     def subscribe_with(consumer, opts = {})
@@ -189,8 +177,8 @@ module HotBunnies
 
       @default_consumer = consumer
       @channel.register_consumer(@consumer_tag, consumer)
-      consumer.start
 
+      consumer.start
       consumer
     end
 

data/lib/hot_bunnies/session.rb

@@ -5,8 +5,6 @@ require "set"
 module HotBunnies
   java_import com.rabbitmq.client.ConnectionFactory
   java_import com.rabbitmq.client.Connection
-  java_import java.util.concurrent.ConcurrentHashMap
-  java_import java.util.concurrent.ConcurrentSkipListSet
 
   # Connection to a RabbitMQ node.
   #
@@ -73,20 +71,19 @@ module HotBunnies
       new(cf, options)
     end
 
-    # @private
-    attr_reader :thread
     # @return [Array<HotBunnies::Channel>] Channels opened on this connection
     attr_reader :channels
 
 
     # @private
     def initialize(connection_factory, opts = {})
-      @cf         = connection_factory
-      @connection = converting_rjc_exceptions_to_ruby do
+      @cf               = connection_factory
+      @executor_factory = opts[:executor_factory]
+      @connection       = converting_rjc_exceptions_to_ruby do
         self.new_connection
       end
-      @channels   = ConcurrentHashMap.new
-      @thread     = Thread.current
+      @channels    = JavaConcurrent::ConcurrentHashMap.new
+      @thread_pool = ThreadPools.dynamically_growing
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -95,7 +92,7 @@ module HotBunnies
                                  opts[:automatically_recover] || opts[:automatic_recovery]
                                end
       @network_recovery_interval = opts.fetch(:network_recovery_interval, DEFAULT_NETWORK_RECOVERY_INTERVAL)
-      @shutdown_hooks            = ConcurrentSkipListSet.new
+      @shutdown_hooks            = JavaConcurrent::ConcurrentSkipListSet.new
 
       if @automatically_recover
         self.add_automatic_recovery_hook
@@ -118,7 +115,7 @@ module HotBunnies
              @connection.create_channel
            end
 
-      ch = Channel.new(self, jc)
+      ch = Channel.new(self, jc, @thread_pool)
       register_channel(ch)
 
       ch
@@ -129,6 +126,11 @@ module HotBunnies
         ch.close
       end
 
+      @thread_pool.shutdown
+      unless @thread_pool.await_termination(5, JavaConcurrent::TimeUnit::SECONDS)
+        @thread_pool.shutdown_now
+      end
+
       @connection.close
     end
 
@@ -169,6 +171,7 @@ module HotBunnies
       @connection = converting_rjc_exceptions_to_ruby do
         self.new_connection
       end
+      @thread_pool = ThreadPools.dynamically_growing
       self.recover_shutdown_hooks
 
       @channels.each do |id, ch|
@@ -319,7 +322,12 @@ module HotBunnies
     # @private
     def new_connection
       converting_rjc_exceptions_to_ruby do
-        @cf.new_connection
+        if @executor_factory
+          ex = @executor_factory.call
+          @cf.new_connection(ex)
+        else
+          @cf.new_connection
+        end
       end
     end
   end

data/lib/hot_bunnies/thread_pools.rb

@@ -1,6 +1,4 @@
 module HotBunnies
-  import java.util.concurrent.Executors
-
   # A slighly more Ruby developer-friendly way of instantiating various
   # JDK executors (thread pools).
   class ThreadPools
@@ -11,14 +9,14 @@ module HotBunnies
       raise ArgumentError.new("n must be a positive integer!") unless Integer === n
       raise ArgumentError.new("n must be a positive integer!") unless n > 0
 
-      Executors.new_fixed_thread_pool(n)
+      JavaConcurrent::Executors.new_fixed_thread_pool(n)
     end
 
     # Returns a new thread pool (JDK executor) of a fixed size of 1.
     #
     # @return A thread pool (JDK executor)
     def self.single_threaded
-      Executors.new_single_thread_executor
+      JavaConcurrent::Executors.new_single_thread_executor
     end
 
     # Returns a new thread pool (JDK executor) that will create new
@@ -26,7 +24,7 @@ module HotBunnies
     #
     # @return A thread pool (JDK executor)
     def self.dynamically_growing
-      Executors.new_cached_thread_pool
+      JavaConcurrent::Executors.new_cached_thread_pool
     end
   end
 end

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = "2.0.0.pre10"
+  VERSION = "2.0.0.pre11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_bunnies
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre10
+  version: 2.0.0.pre11
   prerelease: 6
 platform: java
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -26,7 +26,6 @@ files:
 - lib/hot_bunnies/consumers.rb
 - lib/hot_bunnies/consumers/base.rb
 - lib/hot_bunnies/consumers/blocking.rb
-- lib/hot_bunnies/consumers/non_blocking.rb
 - lib/hot_bunnies/exceptions.rb
 - lib/hot_bunnies/exchange.rb
 - lib/hot_bunnies/juc.rb

data/lib/hot_bunnies/consumers/non_blocking.rb

@@ -1,93 +0,0 @@
-require "hot_bunnies/consumers/base"
-
-module HotBunnies
-  class CallbackConsumer < BaseConsumer
-    def initialize(channel, queue, callback)
-      raise ArgumentError, "callback must not be nil!" if callback.nil?
-
-      super(channel, queue)
-      @callback = callback
-      @callback_arity = @callback.arity
-    end
-
-    def callback(headers, message)
-      if @callback_arity == 2
-        @callback.call(headers, message)
-      else
-        @callback.call(message)
-      end
-    end
-  end
-
-  class AsyncCallbackConsumer < CallbackConsumer
-    def initialize(channel, queue, opts, callback)
-      super(channel, queue, callback)
-
-      # during connection recovery, the executor may be shut down, e.g. due to
-      # an exception. So we need a way to create a duplicate. Unfortunately, since
-      # the executor can be passed as an argument, we cannot know how it was
-      # instantiated. Instead we require a lambda to produce instance of an executor
-      # as a workaround. MK.
-      @executor_factory = opts.fetch(:executor_factory, Proc.new {
-        JavaConcurrent::Executors.new_single_thread_executor
-      })
-      @executor         = opts.fetch(:executor, @executor_factory.call)
-      @executor_submit  = @executor.java_method(:submit, [JavaConcurrent::Runnable.java_class])
-      @opts             = opts
-    end
-
-    def deliver(headers, message)
-      unless @executor.shutdown?
-        @executor_submit.call do
-          begin
-            callback(headers, message)
-          rescue Exception, java.lang.Throwable => e
-            # TODO: logging
-            $stderr.puts "Unhandled exception in consumer #{@consumer_tag}: #{e}"
-          end
-        end
-      end
-    end
-
-    def cancel
-      @cancelling.set(true)
-      response = channel.basic_cancel(consumer_tag)
-      @cancelled.set(true)
-      @terminated.set(true)
-
-      gracefully_shutdown
-
-      response
-    end
-
-    def handleCancel(consumer_tag)
-      super(consumer_tag)
-
-      gracefully_shutdown
-    end
-
-    def shutdown!
-      @executor.shutdown_now if @executor
-    end
-    alias shut_down! shutdown!
-
-    def gracefully_shut_down
-      unless @executor.await_termination(1, JavaConcurrent::TimeUnit::SECONDS)
-        @executor.shutdown_now
-      end
-      @terminated.set(true)
-    end
-    alias maybe_shut_down_executor gracefully_shut_down
-    alias gracefully_shutdown      gracefully_shut_down
-
-
-    # @private
-    def recover_from_network_failure
-      # ensure we have a functioning executor. MK.
-      @executor        = @executor_factory.call
-      @executor_submit = @executor.java_method(:submit, [JavaConcurrent::Runnable.java_class])
-
-      super
-    end
-  end
-end