bunny 0.9.0.pre10 → 0.9.0.pre11

data/spec/issues/issue78_spec.rb

@@ -1,73 +1,75 @@
 require "spec_helper"
 
-describe Bunny::Queue, "#subscribe" do
-  let(:connection1) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
-  end
-  let(:connection2) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
-  end
+unless ENV["CI"]
+  describe Bunny::Queue, "#subscribe" do
+    let(:connection1) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      c.start
+      c
+    end
+    let(:connection2) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      c.start
+      c
+    end
 
-  after :all do
-    connection1.close if connection1.open?
-    connection2.close if connection2.open?
-  end
+    after :all do
+      connection1.close if connection1.open?
+      connection2.close if connection2.open?
+    end
 
 
-  context "with an empty queue" do
-    it "consumes messages" do
-      delivered_data = []
+    context "with an empty queue" do
+      it "consumes messages" do
+        delivered_data = []
 
-      ch1 = connection1.create_channel
-      ch2 = connection1.create_channel
+        ch1 = connection1.create_channel
+        ch2 = connection1.create_channel
 
-      q   = ch1.queue("", :exclusive => true)
-      q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
-        delivered_data << payload
-      end
-      sleep 0.5
+        q   = ch1.queue("", :exclusive => true)
+        q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
+          delivered_data << payload
+        end
+        sleep 0.5
 
-      x = ch2.default_exchange
-      x.publish("abc", :routing_key => q.name)
-      sleep 0.7
+        x = ch2.default_exchange
+        x.publish("abc", :routing_key => q.name)
+        sleep 0.7
 
-      delivered_data.should == ["abc"]
+        delivered_data.should == ["abc"]
 
-      ch1.close
-      ch2.close
+        ch1.close
+        ch2.close
+      end
     end
-  end
 
-  context "with a non-empty queue" do
-    let(:queue_name) { "queue#{rand}" }
+    context "with a non-empty queue" do
+      let(:queue_name) { "queue#{rand}" }
 
-    it "consumes messages" do
-      delivered_data = []
+      it "consumes messages" do
+        delivered_data = []
 
-      ch1 = connection1.create_channel
-      ch2 = connection1.create_channel
+        ch1 = connection1.create_channel
+        ch2 = connection1.create_channel
 
-      q   = ch1.queue(queue_name, :exclusive => true)
-      x = ch2.default_exchange
-      3.times do |i|
-        x.publish("data#{i}", :routing_key => queue_name)
-      end
-      sleep 0.7
-      q.message_count.should == 3
+        q   = ch1.queue(queue_name, :exclusive => true)
+        x = ch2.default_exchange
+        3.times do |i|
+          x.publish("data#{i}", :routing_key => queue_name)
+        end
+        sleep 0.7
+        q.message_count.should == 3
 
-      q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
-        delivered_data << payload
-      end
-      sleep 0.7
+        q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
+          delivered_data << payload
+        end
+        sleep 0.7
 
-      delivered_data.should == ["data0", "data1", "data2"]
+        delivered_data.should == ["data0", "data1", "data2"]
 
-      ch1.close
-      ch2.close
+        ch1.close
+        ch2.close
+      end
     end
   end
 end

data/spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb

@@ -24,27 +24,5 @@ unless ENV["CI"]
         end
       end
     end
-
-    context "in a multi-threaded scenario" do
-      # actually, on MRI values greater than ~100 will eventually cause write
-      # operations to fail with a timeout (1 second is not enough)
-      # which will cause recovery to re-acquire @channel_mutex in Session.
-      # Because Ruby's mutexes are not re-entrant, it will raise a ThreadError.
-      #
-      # But this already demonstrates that within these platform constraints,
-      # Bunny is safe to use in such scenarios.
-      let(:n) { 20 }
-
-      it "works correctly" do
-        n.times do
-          t = Thread.new do
-            ch = connection.create_channel
-
-            ch.close
-          end
-          t.abort_on_exception = true
-        end
-      end
-    end
   end
 end

data/spec/stress/concurrent_consumers_stress_spec.rb

@@ -4,7 +4,8 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Concurrent consumers sharing a connection" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false)
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
+                    :automatic_recovery => false, :continuation_timeout => 6000)
       c.start
       c
     end

data/spec/stress/concurrent_publishers_stress_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Concurrent publishers sharing a connection" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatically_recover => false)
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatically_recover => false, :continuation_timeout => 20.0)
       c.start
       c
     end
@@ -13,8 +13,8 @@ unless ENV["CI"]
       connection.close
     end
 
-    let(:n) { 32 }
-    let(:m) { 1000 }
+    let(:concurrency) { 24 }
+    let(:rate)        { 5_000 }
 
     it "successfully finish publishing" do
       ch = connection.create_channel
@@ -26,22 +26,22 @@ unless ENV["CI"]
       sleep 0.25
 
       chs  = {}
-      n.times do |i|
+      concurrency.times do |i|
         chs[i] = connection.create_channel
       end
 
       ts = []
 
-      n.times do |i|
+      concurrency.times do |i|
         t = Thread.new do
           cht = chs[i]
           x   = ch.default_exchange
 
           5.times do |i|
-            m.times do
+            rate.times do
               x.publish(body, :routing_key => q.name)
             end
-            puts "Published #{(i + 1) * m} messages..."
+            puts "Published #{(i + 1) * rate} messages..."
           end
         end
         t.abort_on_exception = true
@@ -52,9 +52,6 @@ unless ENV["CI"]
       ts.each do |t|
         t.join
       end
-
-      sleep 4.0
-      q.message_count.should == 5 * n * m
     end
   end
 end

data/spec/stress/long_running_consumer_spec.rb

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+require "spec_helper"
+
+unless ENV["CI"]
+  require "bunny/concurrent/condition"
+  require "bunny/test_kit"
+
+  describe "Long running [relatively to heartbeat interval] consumer that never publishes" do
+    let(:connection) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false, :heartbeat_interval => 6)
+      c.start
+      c
+    end
+
+    after :all do
+      connection.close
+    end
+
+    let(:target) { 512 * 1024 * 1024 }
+    let(:queue)  { "bunny.stress.long_running_consumer.#{Time.now.to_i}" }
+
+    let(:rate) { 50 }
+    let(:s)    { 4.0 }
+
+
+
+    it "does not skip heartbeats" do
+      finished = Bunny::Concurrent::Condition.new
+
+      ct = Thread.new do
+        t  = 0
+        ch = connection.create_channel(nil, 6)
+        begin
+          q  = ch.queue(queue, :exclusive => true)
+
+          q.bind("amq.fanout").subscribe do |_, _, payload|
+            t += payload.bytesize
+
+            if t >= target
+              puts "Hit the target, done with the test..."
+
+              finished.notify_all
+            else
+              puts "Consumed #{(t.to_f / target.to_f).round(3) * 100}% of data"
+            end
+          end
+        rescue Interrupt => e
+          ch.maybe_kill_consumer_work_pool!
+          ch.close
+        end
+      end
+      ct.abort_on_exception = true
+
+      pt = Thread.new do
+        t  = 0
+        ch = connection.create_channel
+        begin
+          x  = ch.fanout("amq.fanout")
+
+          loop do
+            break if t >= target
+
+            rate.times do |i|
+              msg = Bunny::TestKit.message_in_kb(96, 8192, i)
+              x.publish(msg)
+              t += msg.bytesize
+            end
+
+            sleep (s * rand)
+          end
+        rescue Interrupt => e
+          ch.close
+        end
+      end
+      pt.abort_on_exception = true
+
+      finished.wait
+
+      ct.raise Interrupt.new
+      pt.raise Interrupt.new
+    end
+  end
+end

data/spec/unit/concurrent/condition_spec.rb

@@ -22,18 +22,19 @@ describe Bunny::Concurrent::Condition do
 
   describe "#notify" do
     it "notifies a single thread waiting on the latch" do
+      mutex     = Mutex.new
       condition = described_class.new
       xs        = []
 
       t1 = Thread.new do
         condition.wait
-        xs << :notified1
+        mutex.synchronize { xs << :notified1 }
       end
       t1.abort_on_exception = true
 
       t2 = Thread.new do
         condition.wait
-        xs << :notified2
+        mutex.synchronize { xs << :notified2 }
       end
       t2.abort_on_exception = true
 
@@ -45,16 +46,17 @@ describe Bunny::Concurrent::Condition do
   end
 
   describe "#notify_all" do
-    let(:n) { 20 }
+    let(:n) { 120 }
 
     it "notifies all the threads waiting on the latch" do
+      mutex     = Mutex.new
       condition = described_class.new
-      @xs        = []
+      @xs       = []
 
       n.times do |i|
         t = Thread.new do
           condition.wait
-          @xs << "notified#{i + 1}".to_sym
+          mutex.synchronize { @xs << "notified#{i + 1}".to_sym }
         end
         t.abort_on_exception = true
       end

data/spec/unit/concurrent/linked_continuation_queue_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+if defined?(JRUBY_VERSION)
+  require "bunny/concurrent/linked_continuation_queue"
+
+  describe Bunny::Concurrent::LinkedContinuationQueue do
+    describe "#poll with a timeout that is never reached" do
+      it "blocks until the value is available, then returns it" do
+        # force subject evaluation
+        cq = subject
+        t = Thread.new do
+          cq.push(10)
+        end
+        t.abort_on_exception = true
+
+        v = subject.poll(500)
+        v.should == 10
+      end
+    end
+
+    describe "#poll with a timeout that is reached" do
+      it "raises an exception" do
+        # force subject evaluation
+        cq = subject
+        t = Thread.new do
+          sleep 1.5
+          cq.push(10)
+        end
+        t.abort_on_exception = true
+
+        lambda { subject.poll(500) }.should raise_error(::Timeout::Error)
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre10
-  prerelease: 6
+  version: 0.9.0.pre11
 platform: ruby
 authors:
 - Chris Duncan
@@ -10,53 +9,55 @@ authors:
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
 - Stefan Kaes
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    none: false
-  prerelease: false
+        version: 1.6.0
   type: :runtime
-description: Easy to use synchronous Ruby client for RabbitMQ
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+description: Popular easy to use Ruby client for RabbitMQ
 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:
 - README.md
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rspec
+- .ruby-version
+- .travis.yml
+- .yardopts
 - ChangeLog.md
 - Gemfile
 - LICENSE
 - README.md
+- benchmarks/basic_publish/with_128K_messages.rb
+- benchmarks/basic_publish/with_1k_messages.rb
+- benchmarks/basic_publish/with_4K_messages.rb
+- benchmarks/basic_publish/with_64K_messages.rb
+- benchmarks/channel_open.rb
+- benchmarks/queue_declare.rb
+- benchmarks/queue_declare_and_bind.rb
+- benchmarks/queue_declare_bind_and_delete.rb
+- benchmarks/write_vs_write_nonblock.rb
 - bin/ci/before_build.sh
 - bunny.gemspec
 - examples/connection/authentication_failure.rb
@@ -104,16 +105,18 @@ files:
 - lib/bunny/exchange.rb
 - lib/bunny/framing.rb
 - lib/bunny/heartbeat_sender.rb
-- lib/bunny/main_loop.rb
 - lib/bunny/message_properties.rb
 - lib/bunny/queue.rb
+- lib/bunny/reader_loop.rb
 - lib/bunny/return_info.rb
 - lib/bunny/session.rb
 - lib/bunny/socket.rb
 - lib/bunny/ssl_socket.rb
 - lib/bunny/system_timer.rb
+- lib/bunny/test_kit.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
+- profiling/basic_publish/with_4K_messages.rb
 - spec/compatibility/queue_declare_spec.rb
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
@@ -162,36 +165,35 @@ 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/long_running_consumer_spec.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
+- spec/unit/concurrent/linked_continuation_queue_spec.rb
 - spec/unit/transport_spec.rb
 homepage: http://github.com/ruby-amqp/bunny
 licenses:
 - MIT
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - !binary |-
-      Pg==
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
-summary: Easy to use synchronous Ruby client for RabbitMQ
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
+summary: Popular easy to use Ruby client for RabbitMQ
 test_files:
 - spec/compatibility/queue_declare_spec.rb
 - spec/higher_level_api/integration/basic_ack_spec.rb
@@ -241,7 +243,9 @@ 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/long_running_consumer_spec.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
+- spec/unit/concurrent/linked_continuation_queue_spec.rb
 - spec/unit/transport_spec.rb
 has_rdoc: true