bunny 0.9.6 → 0.9.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7580b7ff949410f73fe0dd0d4425d19dd0b8b911
+  data.tar.gz: a6121f81e944a8765cb20ad27c2f2c9aecc38009
+SHA512:
+  metadata.gz: a773f870cdaaec57396812d6120a10052e74468f939f9f587d807755330ac21940248e6166fd46c710969dff365e23eb927bac3cad95fc25e6c07fa66cf8e04a
+  data.tar.gz: 75a2d552c4748e98424f8ce156eb37465550329ffe078184ecdf7103132ce9c8fedf615c8b8048491af018f3ceea2ec4b5f8399107b2e28a427fc544f8175630

data/ChangeLog.md

@@ -1,3 +1,21 @@
+## Changes between Bunny 0.9.6 and 0.9.7
+
+### Reentrant Mutex Implementation
+
+Bunny now allows mutex impl to be configurable, uses reentrant Monitor
+by default.
+
+Non-reentrant mutexes is a major PITA and may affect code that
+uses Bunny.
+
+Avg. publishing throughput with Monitor drops slightly from
+5.73 Khz to 5.49 Khz (about 4% decrease), which is reasonable
+for Bunny.
+
+Apps that need these 4% can configure what mutex implementation
+is used on per-connection basis.
+
+
 ## Changes between Bunny 0.9.5 and 0.9.6
 
 ### Eliminated Race Condition in Bunny::Session#close

data/lib/bunny/channel.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require "thread"
+require "monitor"
 require "set"
 
 require "bunny/consumer_work_pool"
@@ -173,10 +174,10 @@ module Bunny
       @work_pool  = work_pool
 
       # synchronizes frameset delivery. MK.
-      @publishing_mutex = Mutex.new
-      @consumer_mutex   = Mutex.new
+      @publishing_mutex = @connection.mutex_impl.new
+      @consumer_mutex   = @connection.mutex_impl.new
 
-      @unconfirmed_set_mutex = Mutex.new
+      @unconfirmed_set_mutex = @connection.mutex_impl.new
 
       self.reset_continuations
 

data/lib/bunny/channel_id_allocator.rb

@@ -1,4 +1,5 @@
 require "thread"
+require "monitor"
 require "amq/int_allocator"
 
 module Bunny
@@ -18,7 +19,7 @@ module Bunny
     # @param [Integer] max_channel Max allowed channel id
     def initialize(max_channel = ((1 << 16) - 1))
       @allocator = AMQ::IntAllocator.new(1, max_channel)
-      @mutex     = Mutex.new
+      @mutex     = Monitor.new
     end
 
 

data/lib/bunny/concurrent/condition.rb

@@ -1,4 +1,5 @@
 require "thread"
+require "monitor"
 
 module Bunny
   # @private
@@ -14,7 +15,7 @@ module Bunny
 
 
       def initialize(description = nil)
-        @mutex           = Mutex.new
+        @mutex           = Monitor.new
         @waiting_threads = []
         @description     = description
       end

data/lib/bunny/heartbeat_sender.rb

@@ -15,7 +15,7 @@ module Bunny
     def initialize(transport, logger)
       @transport = transport
       @logger    = logger
-      @mutex     = Mutex.new
+      @mutex     = Monitor.new
 
       @last_activity_time = Time.now
     end

data/lib/bunny/reader_loop.rb

@@ -83,7 +83,7 @@ module Bunny
     end
 
     def stopped?
-      @stopped = true
+      @stopped
     end
 
     def kill

data/lib/bunny/session.rb

@@ -1,5 +1,6 @@
 require "socket"
 require "thread"
+require "monitor"
 
 require "bunny/transport"
 require "bunny/channel_id_allocator"
@@ -144,11 +145,14 @@ module Bunny
       @mechanism           = opts.fetch(:auth_mechanism, "PLAIN")
       @credentials_encoder = credentials_encoder_for(@mechanism)
       @locale              = @opts.fetch(:locale, DEFAULT_LOCALE)
+
+      @mutex_impl          = @opts.fetch(:mutex_impl, Monitor)
+
       # mutex for the channel id => channel hash
-      @channel_mutex       = Mutex.new
+      @channel_mutex       = @mutex_impl.new
       # transport operations/continuations mutex. A workaround for
       # the non-reentrant Ruby mutexes. MK.
-      @transport_mutex     = Mutex.new
+      @transport_mutex     = @mutex_impl.new
       @channels            = Hash.new
 
       @origin_thread       = Thread.current
@@ -186,6 +190,9 @@ module Bunny
       @threaded
     end
 
+    # @private
+    attr_reader :mutex_impl
+
     def configure_socket(&block)
       raise ArgumentError, "No block provided!" if block.nil?
 

data/lib/bunny/transport.rb

@@ -1,5 +1,6 @@
 require "socket"
 require "thread"
+require "monitor"
 
 begin
   require "openssl"
@@ -49,7 +50,7 @@ module Bunny
       @connect_timeout    = nil if @connect_timeout == 0
       @disconnect_timeout = @read_write_timeout || @connect_timeout
 
-      @writes_mutex       = Mutex.new
+      @writes_mutex       = @session.mutex_impl.new
 
       maybe_initialize_socket
       prepare_tls_context if @tls_enabled

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/spec/higher_level_api/integration/connection_stop_spec.rb

@@ -1,15 +1,13 @@
 require "spec_helper"
 
 describe Bunny::Session do
-  4000.times do |i|
-    it "can be closed (take #{i})" do
-      c  = Bunny.new(:automatically_recover => false)
-      c.start
-      ch = c.create_channel
+  it "can be closed" do
+    c  = Bunny.new(:automatically_recover => false)
+    c.start
+    ch = c.create_channel
 
-      c.should be_connected
-      c.stop
-      c.should be_closed
-    end
+    c.should be_connected
+    c.stop
+    c.should be_closed
   end
 end

data/spec/stress/connection_open_close_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+unless RUBY_ENGINE == "jruby"
+  describe Bunny::Session do
+    4000.times do |i|
+      it "can be closed (take #{i})" do
+        c  = Bunny.new(:automatically_recover => false)
+        c.start
+        ch = c.create_channel
+
+        c.should be_connected
+        c.stop
+        c.should be_closed
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 0.9.7
 platform: ruby
 authors:
 - Chris Duncan
@@ -13,36 +12,29 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 2.0.
 email:
-- !binary |-
-  Y2VsbGRlZUBnbWFpbC5jb20=
-- !binary |-
-  ZXJpY0A1c3RvcHMuY29t
-- !binary |-
-  c3Rhc3RueUAxMDFpZGVhcy5jeg==
-- !binary |-
-  bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=
-- !binary |-
-  c2thZXNAcmFpbHNleHByZXNzLmRl
+- celldee@gmail.com
+- eric@5stops.com
+- stastny@101ideas.cz
+- michael@novemberain.com
+- skaes@railsexpress.de
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -181,6 +173,7 @@ files:
 - spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
 - spec/stress/concurrent_consumers_stress_spec.rb
 - spec/stress/concurrent_publishers_stress_spec.rb
+- spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
 - spec/tls/cacert.pem
 - spec/tls/client_cert.pem
@@ -193,27 +186,26 @@ files:
 homepage: http://rubybunny.info
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
 test_files:
 - spec/compatibility/queue_declare_spec.rb
@@ -269,6 +261,7 @@ test_files:
 - spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
 - spec/stress/concurrent_consumers_stress_spec.rb
 - spec/stress/concurrent_publishers_stress_spec.rb
+- spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
 - spec/tls/cacert.pem
 - spec/tls/client_cert.pem