ione 1.2.0.pre5 → 1.2.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9338bdefe6cebb6528e884eed99230b3bd6ef0c
-  data.tar.gz: 3e28ef46473409fcca687711a9550a4c91539d67
+  metadata.gz: 580012a6e7c6d917610532fc3fbd917ab9cd7a50
+  data.tar.gz: e5deb87d0deebb5d4cc9d3a1b516b672ef6848a5
 SHA512:
-  metadata.gz: 2f28bebc52bf02a2d885d611b26cb68204e026e35c16d29790b320dc936adfa1e8af2f495148910696df8d7f9c5fc4346115424e3dd82ad52506193daf4ace9e
-  data.tar.gz: 5a466d53f3988533504292269b7494e993ad955be605eccbd9d7230ec2c238fbcb276290a6dc465eaedc6d51e49c814c610304bbb61900048fd45206452ef64a
+  metadata.gz: 5760948be8fe0975500e3f673ffc0b4b4be1ed04aaccbfc44bc4535c668c1d7fec678a2fd498e608fd642a9e6e7354df4e01863f632afff471c4e70b57b6d895
+  data.tar.gz: e912eadf89022cb82d6f65726d1f48ccd8f17c1b434eb0a70dc783adef9407941331830ddc3898fb206e84b34aa300f0ed1b86115e98b684bc20544d38caa36b

data/lib/ione/io/acceptor.rb

@@ -17,6 +17,7 @@ module Ione
         @socket_impl = socket_impl || ServerSocket
         @accept_listeners = []
         @lock = Mutex.new
+        @state = :binding
       end
 
       def on_accept(&listener)
@@ -38,6 +39,7 @@ module Ione
             retry
           end
         end
+        @state = :connected
         Future.resolved(self)
       rescue => e
         close
@@ -45,13 +47,19 @@ module Ione
       end
 
       def close
-        return false unless @io
-        begin
-          @io.close
-        rescue SystemCallError, IOError
-          # nothing to do, the socket was most likely already closed
+        @lock.synchronize do
+          return false if @state == :closed
+          @state = :closed
+        end
+        if @io
+          begin
+            @io.close
+          rescue SystemCallError, IOError
+            # nothing to do, the socket was most likely already closed
+          ensure
+            @io = nil
+          end
         end
-        @io = nil
         true
       end
 
@@ -60,11 +68,11 @@ module Ione
       end
 
       def closed?
-        @io.nil?
+        @state == :closed
       end
 
       def connected?
-        !closed?
+        @state != :closed
       end
 
       def connecting?

data/lib/ione/io/base_connection.rb

@@ -10,6 +10,7 @@ module Ione
         @port = port
         @unblocker = unblocker
         @state = :connecting
+        @writable = false
         @lock = Mutex.new
         @write_buffer = ByteBuffer.new
         @closed_promise = Promise.new
@@ -22,6 +23,7 @@ module Ione
         @lock.synchronize do
           return false if @state == :closed
           @state = :closed
+          @writable = false
         end
         if @io
           begin
@@ -50,7 +52,7 @@ module Ione
       #   has closed
       def drain
         @state = :draining
-        close if @write_buffer.empty?
+        close unless @writable
         @closed_promise.future
       end
 
@@ -71,13 +73,7 @@ module Ione
 
       # @private
       def writable?
-        @lock.lock
-        begin
-          empty_buffer = @write_buffer.empty?
-        ensure
-          @lock.unlock
-        end
-        !(closed? || empty_buffer)
+        @writable && @state != :closed
       end
 
       # Register to receive notifications when new data is read from the socket.
@@ -131,10 +127,11 @@ module Ione
             elsif bytes
               @write_buffer.append(bytes)
             end
+            @writable = !@write_buffer.empty?
           ensure
             @lock.unlock
           end
-          @unblocker.unblock!
+          @unblocker.unblock
         end
       end
 
@@ -143,11 +140,12 @@ module Ione
         if @state == :connected || @state == :draining
           @lock.lock
           begin
-            unless @write_buffer.empty?
+            if @writable
               bytes_written = @io.write_nonblock(@write_buffer.cheap_peek)
               @write_buffer.discard(bytes_written)
             end
-            if @state == :draining && @write_buffer.empty?
+            @writable = !@write_buffer.empty?
+            if @state == :draining && !@writable
               close
             end
           ensure

data/lib/ione/io/io_reactor.rb

@@ -87,6 +87,7 @@ module Ione
         @unblocker = Unblocker.new
         @io_loop = IoLoopBody.new(options)
         @io_loop.add_socket(@unblocker)
+        @scheduler = Scheduler.new
         @running = false
         @stopped = false
         @started_promise = Promise.new
@@ -128,10 +129,13 @@ module Ione
         Thread.start do
           @started_promise.fulfill(self)
           begin
-            @io_loop.tick until @stopped
+            until @stopped
+              @io_loop.tick
+              @scheduler.tick
+            end
           ensure
             @io_loop.close_sockets
-            @io_loop.cancel_timers
+            @scheduler.cancel_timers
             @running = false
             if $!
               @stopped_promise.fail($!)
@@ -181,7 +185,7 @@ module Ione
         connection = Connection.new(host, port, timeout, @unblocker, @clock)
         f = connection.connect
         @io_loop.add_socket(connection)
-        @unblocker.unblock!
+        @unblocker.unblock
         if ssl
           f = f.flat_map do
             ssl_context = ssl == true ? nil : ssl
@@ -189,7 +193,7 @@ module Ione
             ff = upgraded_connection.connect
             @io_loop.remove_socket(connection)
             @io_loop.add_socket(upgraded_connection)
-            @unblocker.unblock!
+            @unblocker.unblock
             ff
           end
         end
@@ -212,7 +216,7 @@ module Ione
         end
         f = server.bind
         @io_loop.add_socket(server)
-        @unblocker.unblock!
+        @unblocker.unblock
         f = f.map(&block) if block_given?
         f
       end
@@ -220,7 +224,7 @@ module Ione
       # @private
       def accept(socket)
         @io_loop.add_socket(socket)
-        @unblocker.unblock!
+        @unblocker.unblock
       end
 
       # Returns a future that completes after the specified number of seconds.
@@ -229,7 +233,7 @@ module Ione
       #   future is completed
       # @return [Ione::Future] a future that completes when the timer expires
       def schedule_timer(timeout)
-        @io_loop.schedule_timer(timeout)
+        @scheduler.schedule_timer(timeout)
       end
 
       # Cancels a previously scheduled timer.
@@ -238,7 +242,7 @@ module Ione
       #
       # @param timer_future [Ione::Future] the future returned by {#schedule_timer}
       def cancel_timer(timer_future)
-        @io_loop.cancel_timer(timer_future)
+        @scheduler.cancel_timer(timer_future)
       end
 
       def to_s
@@ -269,7 +273,7 @@ module Ione
         @in.nil?
       end
 
-      def unblock!
+      def unblock
         @lock.lock
         @in.write(PING_BYTE)
       ensure
@@ -322,7 +326,7 @@ module Ione
       end
 
       def to_s
-        "#<Timer #{@time}>"
+        "#<Timer @time=#{@time}>"
       end
       alias_method :inspect, :to_s
     end
@@ -332,10 +336,9 @@ module Ione
       def initialize(options={})
         @selector = options[:selector] || IO
         @clock = options[:clock] || Time
+        @timeout = options[:tick_resolution] || 1
         @lock = Mutex.new
         @sockets = []
-        @timer_queue = Heap.new
-        @pending_timers = {}
       end
 
       def add_socket(socket)
@@ -353,6 +356,53 @@ module Ione
         end
       end
 
+      def close_sockets
+        @sockets.each do |s|
+          begin
+            s.close
+          rescue
+            # the socket had most likely already closed due to an error
+          end
+        end
+      end
+
+      def tick
+        readables = []
+        writables = []
+        connecting = []
+        @sockets.each do |s|
+          if s.connected?
+            readables << s
+          elsif s.connecting?
+            connecting << s
+          end
+          if s.connecting? || s.writable?
+            writables << s
+          end
+        end
+        begin
+          r, w, _ = @selector.select(readables, writables, nil, @timeout)
+          connecting.each { |s| s.connect }
+          r && r.each { |s| s.read }
+          w && w.each { |s| s.flush }
+        rescue IOError, Errno::EBADF
+        end
+      end
+
+      def to_s
+        %(#<#{IoReactor.name} @connections=[#{@sockets.map(&:to_s).join(', ')}]>)
+      end
+    end
+
+    # @private
+    class Scheduler
+      def initialize(options={})
+        @clock = options[:clock] || Time
+        @lock = Mutex.new
+        @timer_queue = Heap.new
+        @pending_timers = {}
+      end
+
       def schedule_timer(timeout)
         @lock.lock
         timer = Timer.new(@clock.now + timeout)
@@ -378,16 +428,6 @@ module Ione
         end
       end
 
-      def close_sockets
-        @sockets.each do |s|
-          begin
-            s.close unless s.closed?
-          rescue
-            # the socket had most likely already closed due to an error
-          end
-        end
-      end
-
       def cancel_timers
         while (timer = @timer_queue.pop)
           @pending_timers.delete(timer.future)
@@ -395,36 +435,7 @@ module Ione
         end
       end
 
-      def tick(timeout=1)
-        check_sockets!(timeout)
-        check_timers!
-      end
-
-      def to_s
-        %(#<#{IoReactor.name} @connections=[#{@sockets.map(&:to_s).join(', ')}]>)
-      end
-
-      private
-
-      def check_sockets!(timeout)
-        readables, writables, connecting = [], [], []
-        sockets = @sockets
-        sockets.each do |s|
-          next if s.closed?
-          readables << s if s.connected?
-          writables << s if s.connecting? || s.writable?
-          connecting << s if s.connecting?
-        end
-        begin
-          r, w, _ = @selector.select(readables, writables, nil, timeout)
-          connecting.each(&:connect)
-          r && r.each(&:read)
-          w && w.each(&:flush)
-        rescue IOError, Errno::EBADF
-        end
-      end
-
-      def check_timers!
+      def tick
         now = @clock.now
         first_timer = @timer_queue.peek
         if first_timer && first_timer.time <= now
@@ -444,6 +455,10 @@ module Ione
           end
         end
       end
+
+      def to_s
+        %(#<#{self.class.name} @timers=[#{@pending_timers.values.map(&:to_s).join(', ')}]>)
+      end
     end
   end
 end

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.2.0.pre5'.freeze
+  VERSION = '1.2.0.pre6'.freeze
 end

data/spec/integration/io_spec.rb

@@ -18,32 +18,32 @@ describe 'An IO reactor' do
     end
 
     before do
-      fake_server.start!
+      fake_server.start
       io_reactor.start
     end
 
     after do
       io_reactor.stop
-      fake_server.stop!
+      fake_server.stop
     end
 
     it 'connects to the server' do
       io_reactor.connect(ENV['SERVER_HOST'], fake_server.port, 1, &protocol_handler_factory)
-      fake_server.await_connects!(1)
+      fake_server.await_connects(1)
     end
 
     it 'receives data' do
       protocol_handler = io_reactor.connect(ENV['SERVER_HOST'], fake_server.port, 1, &protocol_handler_factory).value
-      fake_server.await_connects!(1)
-      fake_server.broadcast!('hello world')
+      fake_server.await_connects(1)
+      fake_server.broadcast('hello world')
       await { protocol_handler.data.bytesize > 0 }
       protocol_handler.data.should == 'hello world'
     end
 
     it 'receives data on multiple connections' do
       protocol_handlers = Array.new(10) { io_reactor.connect(ENV['SERVER_HOST'], fake_server.port, 1, &protocol_handler_factory).value }
-      fake_server.await_connects!(10)
-      fake_server.broadcast!('hello world')
+      fake_server.await_connects(10)
+      fake_server.broadcast('hello world')
       await { protocol_handlers.all? { |c| c.data.bytesize > 0 } }
       protocol_handlers.sample.data.should == 'hello world'
     end

data/spec/ione/io/acceptor_spec.rb

@@ -179,11 +179,11 @@ module Ione
         end
 
         it 'passes the unblocker along to the connection handler' do
-          unblocker.stub(:unblock!)
+          unblocker.stub(:unblock)
           acceptor.bind
           acceptor.read
           accepted_handlers.first.write('foo')
-          unblocker.should have_received(:unblock!)
+          unblocker.should have_received(:unblock)
         end
       end
 

data/spec/ione/io/connection_common.rb

@@ -95,7 +95,7 @@ shared_examples_for 'a connection' do |options|
   describe '#write/#flush' do
     before do
       socket.stub(:write_nonblock)
-      unblocker.stub(:unblock!)
+      unblocker.stub(:unblock)
     end
 
     it 'appends to its buffer when #write is called' do
@@ -103,7 +103,7 @@ shared_examples_for 'a connection' do |options|
     end
 
     it 'unblocks the reactor' do
-      unblocker.should_receive(:unblock!)
+      unblocker.should_receive(:unblock)
       handler.write('hello world')
     end
 
@@ -190,7 +190,7 @@ shared_examples_for 'a connection' do |options|
         handler.close
         handler.write('hello world')
         handler.flush
-        unblocker.should_not have_received(:unblock!)
+        unblocker.should_not have_received(:unblock)
       end
     end
 
@@ -214,7 +214,7 @@ shared_examples_for 'a connection' do |options|
         handler.drain
         handler.write('hello world')
         handler.flush
-        unblocker.should_not have_received(:unblock!)
+        unblocker.should_not have_received(:unblock)
       end
     end
   end

data/spec/ione/io/connection_spec.rb

@@ -12,7 +12,7 @@ module Ione
       end
 
       let :unblocker do
-        double(:unblocker, unblock!: nil)
+        double(:unblocker, unblock: nil)
       end
 
       let :socket_impl do

data/spec/ione/io/io_reactor_spec.rb

@@ -372,6 +372,13 @@ module Ione
           loop_body.tick
         end
 
+        it 'passes writable sockets as both readable and writable to the selector' do
+          socket.stub(:connected?).and_return(true)
+          socket.stub(:writable?).and_return(true)
+          selector.should_receive(:select).with([socket], [socket], anything, anything).and_return([nil, nil, nil])
+          loop_body.tick
+        end
+
         it 'passes connecting sockets as writable to the selector' do
           socket.stub(:connecting?).and_return(true)
           socket.stub(:connect)
@@ -383,9 +390,6 @@ module Ione
           socket.stub(:closed?).and_return(true)
           selector.should_receive(:select).with([], [], anything, anything).and_return([nil, nil, nil])
           loop_body.tick
-          socket.stub(:connected?).and_return(true)
-          selector.should_receive(:select).with([], [], anything, anything).and_return([nil, nil, nil])
-          loop_body.tick
         end
 
         it 'does nothing when IO.select raises Errno::EBADF' do
@@ -428,29 +432,9 @@ module Ione
         end
 
         it 'allows the caller to specify a custom timeout' do
+          loop_body = described_class.new(selector: selector, clock: clock, tick_resolution: 99)
           selector.should_receive(:select).with(anything, anything, anything, 99).and_return([[], [], []])
-          loop_body.tick(99)
-        end
-
-        it 'completes timers that have expired' do
-          selector.stub(:select).and_return([nil, nil, nil])
-          clock.stub(:now).and_return(1)
-          future = loop_body.schedule_timer(1)
           loop_body.tick
-          future.should_not be_completed
-          clock.stub(:now).and_return(2)
-          loop_body.tick
-          future.should be_completed
-        end
-
-        it 'clears out timers that have expired' do
-          selector.stub(:select).and_return([nil, nil, nil])
-          clock.stub(:now).and_return(1)
-          future = loop_body.schedule_timer(1)
-          clock.stub(:now).and_return(2)
-          loop_body.tick
-          future.should be_completed
-          expect { loop_body.tick }.to_not raise_error
         end
       end
 
@@ -474,28 +458,48 @@ module Ione
           loop_body.add_socket(socket2)
           loop_body.close_sockets
         end
+      end
+    end
 
-        it 'does not close already closed sockets' do
-          socket.stub(:closed?).and_return(true)
-          socket.should_not_receive(:close)
-          loop_body.add_socket(socket)
-          loop_body.close_sockets
-        end
+    describe Scheduler do
+      let :scheduler do
+        described_class.new(clock: clock)
       end
 
-      describe '#cancel_timers' do
-        before do
-          selector.stub(:select).and_return([nil, nil, nil])
+      let :clock do
+        double(:clock, now: 0)
+      end
+
+      describe '#tick' do
+        it 'completes timers that have expired' do
+          clock.stub(:now).and_return(1)
+          future = scheduler.schedule_timer(1)
+          scheduler.tick
+          future.should_not be_completed
+          clock.stub(:now).and_return(2)
+          scheduler.tick
+          future.should be_completed
         end
 
+        it 'clears out timers that have expired' do
+          clock.stub(:now).and_return(1)
+          future = scheduler.schedule_timer(1)
+          clock.stub(:now).and_return(2)
+          scheduler.tick
+          future.should be_completed
+          expect { scheduler.tick }.to_not raise_error
+        end
+      end
+
+      describe '#cancel_timers' do
         it 'fails all active timers with a CancelledError' do
           clock.stub(:now).and_return(1)
-          f1 = loop_body.schedule_timer(1)
-          f2 = loop_body.schedule_timer(3)
-          f3 = loop_body.schedule_timer(3)
+          f1 = scheduler.schedule_timer(1)
+          f2 = scheduler.schedule_timer(3)
+          f3 = scheduler.schedule_timer(3)
           clock.stub(:now).and_return(2)
-          loop_body.tick
-          loop_body.cancel_timers
+          scheduler.tick
+          scheduler.cancel_timers
           f1.should be_completed
           f2.should be_failed
           f3.should be_failed

data/spec/ione/io/server_connection_spec.rb

@@ -16,7 +16,7 @@ module Ione
       end
 
       let :unblocker do
-        double(:unblocker, unblock!: nil)
+        double(:unblocker, unblock: nil)
       end
 
       it_behaves_like 'a connection'

data/spec/ione/io/ssl_acceptor_spec.rb

@@ -92,15 +92,15 @@ module Ione
           end
 
           it 'has a reference to the unblocker' do
-            unblocker.stub(:unblock!)
+            unblocker.stub(:unblock)
             acceptor.bind
             acceptor.read
             accepted_handlers.first.write('foo')
-            unblocker.should have_received(:unblock!)
+            unblocker.should have_received(:unblock)
           end
 
           it 'writes to the SSL socket' do
-            unblocker.stub(:unblock!)
+            unblocker.stub(:unblock)
             ssl_socket.stub(:write_nonblock) { |b| b.bytesize }
             acceptor.bind
             acceptor.read

data/spec/ione/io/ssl_connection_spec.rb

@@ -24,7 +24,7 @@ module Ione
       end
 
       let :unblocker do
-        double(:unblocker, unblock!: nil)
+        double(:unblocker, unblock: nil)
       end
 
       let :ssl_context do

data/spec/support/fake_server.rb

@@ -13,7 +13,7 @@ class FakeServer
     @received_bytes = ''
   end
 
-  def start!(options={})
+  def start(options={})
     @lock.synchronize do
       return if @running
       @running = true
@@ -30,7 +30,7 @@ class FakeServer
     self
   end
 
-  def stop!
+  def stop
     @lock.synchronize do
       return unless @running
       @running = false
@@ -41,13 +41,13 @@ class FakeServer
     end
   end
 
-  def broadcast!(bytes)
+  def broadcast(bytes)
     @lock.synchronize do
       @connections.each { |c| c.write_nonblock(bytes) }
     end
   end
 
-  def await_connects!(n=1)
+  def await_connects(n=1)
     started_at = Time.now
     until @connects >= n
       sleep(0.01)
@@ -55,7 +55,7 @@ class FakeServer
     end
   end
 
-  def await_disconnects!(n=1)
+  def await_disconnects(n=1)
     started_at = Time.now
     until @disconnects >= n
       sleep(0.01)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre5
+  version: 1.2.0.pre6
 platform: ruby
 authors:
 - Theo Hultberg