amq-protocol 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed555f9528be0395d8ba9a11a39e193aa347f89
-  data.tar.gz: 345f66cb02153603fb16465bc9edddaf1b2bc63a
+  metadata.gz: 4ac3c4778d62f3a7f84cd1132c77de339a2e97c3
+  data.tar.gz: 205cf9a34ea9addcfe2458e1dfcc9b6fe8a6c81c
 SHA512:
-  metadata.gz: b5b11714e11f26704f9768d750bb61c4034edac91141d6a1743ad7fbbc6999fc88b2c70acbbbc42f14cdc6bd3eb3a0a3441519bd2922413a03d13a208d101e08
-  data.tar.gz: f50280bc01e330a2b2952585b444ceb5b195855836d572791c727c73b6d295b3037b76fc4ccf042837656a684f23889658114a981a55a33f50a05651d85b8478
+  metadata.gz: ed02a18089fc8e1f633716981a1d995cf5ad6eb8663bdfb794effc32351dea6d97b56cbcea01a413f65d1ace0a56f1853bbe0bcce10072587c9439eb60d748d2
+  data.tar.gz: 0c2344d1e5919666c6b38934fe3f38817f117f117ed8606b6090c96e7e43c6e8afa556bbf4bf9e2e082e7bea75518ac5090f9d48d869525edb532fc67a95856e

data/.travis.yml

@@ -6,14 +6,12 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - 1.9.2
-  - rbx-19mode
+  - rbx-2.2.0
   - ruby-head
-  - jruby-head
   - 1.8.7
-  - rbx-18mode
 notifications:
   recipients:
-    - michael@novemberain.com
+    - michael@rabbitmq.com
 matrix:
   allow_failures:
     - rvm: ruby-head

data/ChangeLog.md

@@ -1,3 +1,23 @@
+## Changes between 1.8.0 and 1.9.0
+
+### Performance Improvements in AMQ::BitSet
+
+`AMQ::BitSet#next_clear_bit` is now drastically more efficient
+(down from 6 minutes for 10,000 iterations to 4 seconds for 65,536 iterations).
+
+Contributed by Doug Rohrer, Dave Anderson, and Jason Voegele from
+[Neo](http://www.neo.com).
+
+
+## Changes between 1.7.0 and 1.8.0
+
+### Body Framing Fix
+
+Messages exactly 128 Kb in size are now framed correctly.
+
+Contributed by Nicolas Viennot.
+
+
 ## Changes between 1.6.0 and 1.7.0
 
 ### connection.blocked Support

data/README.md

@@ -43,7 +43,7 @@ amq-protocol is maintained by [Michael Klishin](https://github.com/michaelklishi
 [![Build Status](https://secure.travis-ci.org/ruby-amqp/amq-protocol.png)](https://travis-ci.org/ruby-amqp/amq-protocol)
 
 
-## Development
+## Issues
 
 Please report any issues you may find to our [Issue tracker](http://github.com/ruby-amqp/amq-protocol/issues) on GitHub.
 

data/benchmarks/int_allocator.rb

@@ -0,0 +1,34 @@
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'amq/int_allocator'
+require "benchmark"
+
+allocator = AMQ::IntAllocator.new(1,65535)
+mutex = Mutex.new
+
+Benchmark.bm do |x|
+
+
+  x.report("allocate") do
+    allocator = AMQ::IntAllocator.new(1,65535)
+    1.upto(65534) do |i|
+      mutex.synchronize do
+        n = allocator.allocate
+        raise 'it be broke' unless n == i
+      end
+    end
+  end
+
+  x.report("allocate_with_release") do
+    allocator = AMQ::IntAllocator.new(1,65535)
+    1.upto(65534) do |i|
+      mutex.synchronize do
+        n = allocator.allocate
+        if i % 5 == 0
+          allocator.release(n)
+        end
+      end
+    end
+  end
+
+end

data/lib/amq/bit_set.rb

@@ -7,6 +7,7 @@ module AMQ
   # Originally part of amqp gem. Extracted to make it possible for Bunny to use it.
   class BitSet
 
+    attr_reader :words_in_use
     #
     # API
     #
@@ -28,8 +29,10 @@ module AMQ
     # @param [Integer] A bit to set
     # @api public
     def set(i)
+      check_range(i)
       w = self.word_index(i)
-      @words[w] |= (1 << i)
+      result = @words[w] |= (1 << (i % BITS_PER_WORD))
+      result
     end # set(i)
 
     # Fetches flag value for given bit.
@@ -38,9 +41,10 @@ module AMQ
     # @return [Boolean] true if given bit is set, false otherwise
     # @api public
     def get(i)
+      check_range(i)
       w = self.word_index(i)
 
-      (@words[w] & (1 << i)) != 0
+      (@words[w] & (1 << i % BITS_PER_WORD)) != 0
     end # get(i)
     alias [] get
 
@@ -49,10 +53,12 @@ module AMQ
     # @param [Integer] A bit to unset
     # @api public
     def unset(i)
+      check_range(i)
       w = self.word_index(i)
       return if w.nil?
 
-      @words[w] &= ~(1 << i)
+      result = @words[w] &= ~(1 << i % BITS_PER_WORD)
+      result
     end # unset(i)
 
     # Clears all bits in the set
@@ -61,22 +67,53 @@ module AMQ
       self.init_words(@nbits)
     end # clear
 
+    def next_clear_bit()
+      @words.each_with_index do |word, i|
+        if word == WORD_MASK
+          next
+        end
+        return i * BITS_PER_WORD + BitSet.number_of_trailing_ones(word)
+      end
+      -1
+    end # next_clear_bit
+
+    def to_s
+      result = ""
+      @words.each do |w|
+        result += w.to_s(2).rjust(BITS_PER_WORD,'0') + ":"
+      end
+      result
+    end # to_s
 
     #
     # Implementation
     #
 
+    # @private
+    def self.number_of_trailing_ones(num)
+      0.upto(BITS_PER_WORD) do |bit|
+        return bit if num[bit] == 0
+      end
+      BITS_PER_WORD
+    end # number_of_trailing_ones
+
+    # @private
+    def word_index(i)
+      i >> ADDRESS_BITS_PER_WORD
+    end # word_index
+
     protected
 
     # @private
     def init_words(nbits)
       n      = word_index(nbits-1) + 1
-      @words = Array.new(n) { 1 }
+      @words = Array.new(n) { 0 }
     end # init_words
 
-    # @private
-    def word_index(i)
-      i >> ADDRESS_BITS_PER_WORD
-    end # word_index(i)
+    def check_range(i)
+      if i < 0 || i >= @nbits
+        raise IndexError.new("Cannot access bit #{i} from a BitSet with #{@nbits} bits")
+      end
+    end # check_range
   end # BitSet
 end # AMQ

data/lib/amq/int_allocator.rb

@@ -43,10 +43,16 @@ module AMQ
     #
     # @return [Integer] Allocated integer if allocation succeeded. nil otherwise.
     def allocate
-      if n = find_unallocated_position
-        @free_set.set(n)
 
-        n
+      if n = @free_set.next_clear_bit
+
+        if n < @hi - 1 then
+          @free_set.set(n)
+          n + 1
+        else
+          -1
+        end
+
       else
         -1
       end
@@ -57,13 +63,13 @@ module AMQ
     #
     # @return [NilClass] nil
     def free(reservation)
-      @free_set.unset(reservation)
+      @free_set.unset(reservation-1)
     end # free(reservation)
     alias release free
 
     # @return [Boolean] true if provided argument was previously allocated, false otherwise
     def allocated?(reservation)
-      @free_set.get(reservation)
+      @free_set.get(reservation-1)
     end # allocated?(reservation)
 
     # Releases the whole allocation range
@@ -75,22 +81,5 @@ module AMQ
 
     protected
 
-    # This implementation is significantly less efficient
-    # that what the RabbitMQ Java client has (based on java.lang.Long#nextSetBit and
-    # java.lang.Long.numberOfTrailingZeros, and thus binary search over bits).
-    # But for channel id generation, this is a good enough implementation.
-    #
-    # @private
-    def find_unallocated_position
-      r = nil
-      @range.each do |i|
-        if !@free_set.get(i)
-          r = i
-          break;
-        end
-      end
-
-      r
-    end # find_unallocated_position
   end # IntAllocator
 end # AMQ

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.8.0"
+    VERSION = "1.9.0"
   end # Protocol
 end # AMQ

data/spec/amq/bit_set_spec.rb

@@ -19,6 +19,32 @@ describe AMQ::BitSet do
   # Examples
   #
 
+  describe "#new" do
+    it "has no bits set at the start" do
+      bs = AMQ::BitSet.new(128)
+      0.upto(127) do |i|
+        bs[i].should == false
+      end
+    end # it
+  end # describe
+
+  describe "#word_index" do
+    subject do
+      described_class.new(nbits)
+    end
+    it "returns 0 when the word is between 0 and 63" do
+      subject.word_index(0).should == 0
+      subject.word_index(63).should == 0
+    end # it
+    it "returns 1 when the word is between 64 and 127" do
+      subject.word_index(64).should == 1
+      subject.word_index(127).should == 1
+    end # it
+    it "returns 2 when the word is between 128 and another number" do
+      subject.word_index(128).should == 2
+    end # it
+  end # describe
+
   describe "#get, #[]" do
     describe "when bit at given position is set" do
       subject do
@@ -41,6 +67,19 @@ describe AMQ::BitSet do
         subject.get(5).should be_false
       end # it
     end # describe
+
+    describe "when index out of range" do
+      subject do
+        described_class.new(nbits)
+      end
+
+      it "should raise IndexError for negative index" do
+        lambda { subject.get(-1) }.should raise_error(IndexError)
+      end # it
+      it "should raise IndexError for index >= number of bits" do
+        lambda { subject.get(nbits) }.should raise_error(IndexError)
+      end # it
+    end # describe
   end # describe
 
 
@@ -56,7 +95,7 @@ describe AMQ::BitSet do
         subject.set(3)
         subject[3].should be_true
       end # it
-    end
+    end # describe
 
     describe "when bit at given position is off" do
       subject do
@@ -72,7 +111,20 @@ describe AMQ::BitSet do
 
         subject.set(3387)
         subject.get(3387).should be_true
+      end # it
+    end # describe
+
+    describe "when index out of range" do
+      subject do
+        described_class.new(nbits)
       end
+
+      it "should raise IndexError for negative index" do
+        lambda { subject.set(-1) }.should raise_error(IndexError)
+      end # it
+      it "should raise IndexError for index >= number of bits" do
+        lambda { subject.set(nbits) }.should raise_error(IndexError)
+      end # it
     end # describe
   end # describe
 
@@ -103,6 +155,19 @@ describe AMQ::BitSet do
         subject.get(3).should be_false
       end # it
     end # describe
+
+    describe "when index out of range" do
+      subject do
+        described_class.new(nbits)
+      end
+
+      it "should raise IndexError for negative index" do
+        lambda { subject.unset(-1) }.should raise_error(IndexError)
+      end # it
+      it "should raise IndexError for index >= number of bits" do
+        lambda { subject.unset(nbits) }.should raise_error(IndexError)
+      end # it
+    end # describe
   end # describe
 
 
@@ -123,6 +188,45 @@ describe AMQ::BitSet do
 
       subject.get(3).should be_false
       subject.get(7668).should be_false
+    end # it
+  end # describe
+
+  describe "#number_of_trailing_ones" do
+    it "calculates them" do
+      described_class.number_of_trailing_ones(0).should == 0
+      described_class.number_of_trailing_ones(1).should == 1
+      described_class.number_of_trailing_ones(2).should == 0
+      described_class.number_of_trailing_ones(3).should == 2
+      described_class.number_of_trailing_ones(4).should == 0
+    end # it
+  end # describe
+
+  describe '#next_clear_bit' do
+    subject do
+      described_class.new(255)
     end
-  end
+    it "returns sequential values when none have been returned" do
+      subject.next_clear_bit.should == 0
+      subject.set(0)
+      subject.next_clear_bit.should == 1
+      subject.set(1)
+      subject.next_clear_bit.should == 2
+      subject.unset(1)
+      subject.next_clear_bit.should == 1
+    end # it
+
+    it "returns the same number as long as nothing is set" do
+      subject.next_clear_bit.should == 0
+      subject.next_clear_bit.should == 0
+    end # it
+
+    it "handles more than 128 bits" do
+      0.upto(254) do |i|
+        subject.set(i)
+        subject.next_clear_bit.should == i + 1
+      end
+      subject.unset(254)
+      subject.get(254).should be_false
+    end # it
+  end # describe
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
@@ -35,6 +35,7 @@ files:
 - README.md
 - Rakefile
 - amq-protocol.gemspec
+- benchmarks/int_allocator.rb
 - benchmarks/pure/body_framing_with_256k_payload.rb
 - benchmarks/pure/body_framing_with_2k_payload.rb
 - codegen/__init__.py
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amq-protocol
-rubygems_version: 2.0.5
+rubygems_version: 2.1.6
 signing_key: 
 specification_version: 4
 summary: AMQP 0.9.1 encoder & decoder.