ione-rpc 1.1.0.pre0 → 1.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76720f1019ef558e761ca6150d3e6417525f7e4
-  data.tar.gz: e0e60b176ac1d29de164124a9db8090be4224e2c
+  metadata.gz: 4a15bae5d5ac949f0eb49613fcfaa8a55f9e376d
+  data.tar.gz: 318088075e05b2642ec5bc1e57948cc4daa667d4
 SHA512:
-  metadata.gz: 843c6352df3a73996b9df2c110e4c9c259f85fa6dec03cda53619f69af220ba519aa17a11ef583aa111523a6dbe3e8fa09bfd987144dc7e3ee4b3809777b5afa
-  data.tar.gz: 1ecb1ef66d1f4f17ca14dccc216cc21a9ecaec02eee64fe1bed4bf32229f44dd56616df562fc0af64fdd09ab79314b6a651cc5a8d1d21f431e5ac12b406c6dd6
+  metadata.gz: 83514557ca9c22a11f590dd48ccbeb389999d3f77086a539903429c7f3428eb838a2af01c531984aa273277bbc8516451d9415786f67bddb059ea775d9262f55
+  data.tar.gz: d7c39a4d45605ce7335085d55ed11aaa2ad471df50419f380254bdd3acc2b05cede92510921604d5afd38cab864599ed55e19ea4b59064ae1a5c15ab849cb89d

data/lib/ione/rpc/client.rb

@@ -42,16 +42,20 @@ module Ione
         @max_channels = options[:max_channels] || 128
         @logger = options[:logger]
         @hosts = []
-        @connections = []
+        @connections = [].freeze
         Array(options[:hosts]).each { |h| add_host(*h) }
       end
 
       # A client is connected when it has at least one open connection.
       def connected?
+        connections = nil
         @lock.lock
-        @connections.any?
-      ensure
-        @lock.unlock
+        begin
+          connections = @connections
+        ensure
+          @lock.unlock
+        end
+        connections.any?
       end
 
       # Returns an array of info and statistics about the currently open connections.
@@ -99,7 +103,7 @@ module Ione
       # @return [Ione::Future<Ione::Rpc::Client>] a future that resolves to the
       #   client when all connections have closed and the IO reactor has stopped.
       def stop
-        @lock.synchronize { @connections = [] }
+        @lock.synchronize { @connections = [].freeze }
         @io_reactor.stop.map(self)
       end
 
@@ -186,12 +190,14 @@ module Ione
         if connection
           chosen_connection = connection
         else
+          connections = nil
           @lock.lock
           begin
-            chosen_connection = choose_connection(@connections, request)
+            connections = @connections
           ensure
             @lock.unlock
           end
+          chosen_connection = choose_connection(connections, request)
         end
         if chosen_connection && !chosen_connection.closed?
           f = chosen_connection.send_message(request, timeout)
@@ -327,7 +333,7 @@ module Ione
         @logger.info('Connected to %s:%d' % [connection.host, connection.port]) if @logger
         connection.on_closed { |error| handle_disconnected(connection, error) }
         if connect?(connection.host, connection.port)
-          @lock.synchronize { @connections << connection }
+          @lock.synchronize { @connections = (@connections + [connection]).freeze }
         else
           connection.close
         end
@@ -345,7 +351,7 @@ module Ione
         else
           @logger.info(message) if @logger
         end
-        @lock.synchronize { @connections.delete(connection) }
+        @lock.synchronize { @connections = (@connections - [connection]).freeze }
         if error && reconnect?(connection.host, connection.port, 0)
           connect(connection.host, connection.port)
         else

data/lib/ione/rpc/client_peer.rb

@@ -11,12 +11,11 @@ module Ione
         raise ArgumentError, 'More than 2**15 channels is not supported' if max_channels > 2**15
         super(connection, codec, scheduler)
         @lock = Mutex.new
-        @channels = [nil] * max_channels
-        @queue = []
         @encode_eagerly = @codec.recoding?
         @sent_messages = 0
         @received_responses = 0
         @timeouts = 0
+        reset(max_channels)
       end
 
       def stats
@@ -25,7 +24,7 @@ module Ione
           :host => @host,
           :port => @port,
           :max_channels => @channels.size,
-          :active_channels => @channels.size - @channels.count(nil),
+          :active_channels => @channels.size - @free_channels.size,
           :queued_messages => @queue.size,
           :sent_messages => @sent_messages,
           :received_responses => @received_responses,
@@ -82,6 +81,7 @@ module Ione
         begin
           promise = @channels[channel]
           @channels[channel] = nil
+          @free_channels << channel
           @received_responses += 1 if promise
         ensure
           @lock.unlock
@@ -117,7 +117,7 @@ module Ione
       end
 
       def take_channel(promise)
-        if (channel = @channels.index(nil))
+        if (channel = @free_channels.pop)
           @channels[channel] = promise
           channel
         end
@@ -128,10 +128,9 @@ module Ione
         queued_promises = nil
         @lock.lock
         begin
-          in_flight_promises = @channels.reject(&:nil?)
-          @channels = [nil] * @channels.size
+          in_flight_promises = @channels.compact
           queued_promises = @queue.map(&:last)
-          @queue = []
+          reset(@channels.size)
         ensure
           @lock.unlock
         end
@@ -143,6 +142,12 @@ module Ione
         queued_promises.each { |p| p.fail(error) }
         super
       end
+
+      def reset(max_channels)
+        @channels = [nil] * max_channels
+        @free_channels = (0...max_channels).to_a
+        @queue = []
+      end
     end
   end
 end

data/lib/ione/rpc/version.rb

@@ -2,6 +2,6 @@
 
 module Ione
   module Rpc
-    VERSION = '1.1.0.pre0'.freeze
+    VERSION = '1.1.0.pre1'.freeze
   end
 end

data/spec/ione/rpc/client_peer_spec.rb

@@ -104,10 +104,15 @@ module Ione
 
         it 'uses the next available channel' do
           peer.send_message('hello')
+          hello_channel = connection.written_bytes.rpartition('@').last
           peer.send_message('foo')
-          connection.data_listener.call('world@0')
+          foo_channel = connection.written_bytes.rpartition('@').last
+          foo_channel.should_not eq(hello_channel)
+
+          connection.data_listener.call('world@' << hello_channel)
           peer.send_message('bar')
-          connection.written_bytes.should == 'hello@000foo@001bar@000'
+          bar_channel = connection.written_bytes.rpartition('@').last
+          bar_channel.should eq(hello_channel)
         end
 
         it 'queues requests when all channels are in use' do
@@ -131,8 +136,9 @@ module Ione
 
         it 'returns a future that resolves to the response' do
           f = peer.send_message('foo')
+          foo_channel = connection.written_bytes.rpartition('@').last
           f.should_not be_resolved
-          connection.data_listener.call('bar@000')
+          connection.data_listener.call('bar@' << foo_channel)
           f.value.payload.should == 'bar'
         end
 
@@ -144,14 +150,16 @@ module Ione
 
         it 'does not fail the request when the response is received before the timeout passes' do
           f = peer.send_message('foo', 2)
-          connection.data_listener.call('bar@000')
+          foo_channel = connection.written_bytes.rpartition('@').last
+          connection.data_listener.call('bar@' << foo_channel)
           scheduler.timer_promises.first.fulfill
           expect { f.value }.to_not raise_error
         end
 
         it 'cancel the timeout timer when the response is received before the timeout passes' do
           f = peer.send_message('foo', 2)
-          connection.data_listener.call('bar@000')
+          foo_channel = connection.written_bytes.rpartition('@').last
+          connection.data_listener.call('bar@' << foo_channel)
           scheduler.timer_promises.first.fulfill
           scheduler.should have_received(:cancel_timer).once
         end

data/spec/ione/rpc/peer_common.rb

@@ -86,8 +86,8 @@ shared_examples 'peers' do
 
     it 'writes the encoded frame to the connection' do
       peer.send_message('FUZZBAZZ')
-      codec.should have_received(:encode).with('FUZZBAZZ', 0)
-      connection.written_bytes.should == 'FUZZBAZZ@0'
+      codec.should have_received(:encode).with('FUZZBAZZ', kind_of(Fixnum))
+      connection.written_bytes.should match(/\AFUZZBAZZ@\d+\Z/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione-rpc
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre0
+  version: 1.1.0.pre1
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione