ione 1.2.0.pre4 → 1.2.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d198d610290a10e580f755f216bbae8ccca0ab
-  data.tar.gz: ada926b95e4a03d55ffad99687ca9f468d1cdd1f
+  metadata.gz: c9338bdefe6cebb6528e884eed99230b3bd6ef0c
+  data.tar.gz: 3e28ef46473409fcca687711a9550a4c91539d67
 SHA512:
-  metadata.gz: 85e98209e280e3fcd0ca52577ffde6fdbe337191af45830bf9b43d3ded0839aa3ef902267da22abb62f937a2d3321ca0abaf15cd66a0920dfe2a9dc3357d2f19
-  data.tar.gz: e5eac3de0c0024e20bad63f82a32a57973d50081df75bf789f7d76bfda413bb8a180bb5ae6919be3aff91c4fa809d8596bfa26a02b0f3bc995b023801cbf3133
+  metadata.gz: 2f28bebc52bf02a2d885d611b26cb68204e026e35c16d29790b320dc936adfa1e8af2f495148910696df8d7f9c5fc4346115424e3dd82ad52506193daf4ace9e
+  data.tar.gz: 5a466d53f3988533504292269b7494e993ad955be605eccbd9d7230ec2c238fbcb276290a6dc465eaedc6d51e49c814c610304bbb61900048fd45206452ef64a

data/lib/ione/heap.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+module Ione
+  # @private
+  class Heap
+    def initialize
+      @items = []
+    end
+
+    def size
+      @items.size
+    end
+
+    def empty?
+      @items.empty?
+    end
+
+    def push(item)
+      @items << item
+      bubble_up(@items.size - 1)
+    end
+    alias_method :<<, :push
+
+    def peek
+      @items.first
+    end
+
+    def pop
+      if @items.size == 0
+        nil
+      elsif @items.size == 1
+        @items.pop
+      else
+        item = @items.first
+        @items[0] = @items.pop
+        bubble_down(0)
+        item
+      end
+    end
+
+    def delete(item)
+      if item == @items[0]
+        pop
+      elsif (i = index(item))
+        item = @items[i]
+        @items[i] = @items.pop
+        bubble_down(i)
+        item
+      end
+    end
+
+    private
+
+    def index(item, root_index=0)
+      left_index = (root_index * 2) + 1
+      right_index = (root_index * 2) + 2
+      root_item = @items[root_index]
+      if root_item == item
+        root_index
+      elsif left_index < @items.length && item >= @items[left_index] && (i = index(item, left_index))
+        i
+      elsif right_index < @items.length && item >= @items[right_index] && (i = index(item, right_index))
+        i
+      end
+    end
+
+    def bubble_up(index)
+      parent_index = (index - 1)/2
+      if parent_index >= 0 && @items[parent_index] > @items[index]
+        item = @items[index]
+        @items[index] = @items[parent_index]
+        @items[parent_index] = item
+        bubble_up(parent_index)
+      end
+    end
+
+    def bubble_down(index)
+      child_index = (index * 2) + 1
+      unless child_index >= @items.length
+        if child_index + 1 < @items.length && @items[child_index] > @items[child_index + 1]
+          child_index += 1
+        end
+        if @items[index] > @items[child_index]
+          item = @items[index]
+          @items[index] = @items[child_index]
+          @items[child_index] = item
+          bubble_down(child_index)
+        end
+      end
+    end
+  end
+end

data/lib/ione/io/io_reactor.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'ione/heap'
+
+
 module Ione
   module Io
     ReactorError = Class.new(IoError)
@@ -298,6 +301,32 @@ module Ione
       DEFAULT_CONNECT_OPTIONS = {:timeout => 5}.freeze
     end
 
+    # @private
+    class Timer < Promise
+      include Comparable
+
+      attr_reader :time
+
+      def initialize(time)
+        super()
+        @time = time
+      end
+
+      def <=>(other)
+        cmp = @time <=> other.time
+        if cmp == 0
+          self.object_id <=> other.object_id
+        else
+          cmp
+        end
+      end
+
+      def to_s
+        "#<Timer #{@time}>"
+      end
+      alias_method :inspect, :to_s
+    end
+
     # @private
     class IoLoopBody
       def initialize(options={})
@@ -305,7 +334,8 @@ module Ione
         @clock = options[:clock] || Time
         @lock = Mutex.new
         @sockets = []
-        @timers = []
+        @timer_queue = Heap.new
+        @pending_timers = {}
       end
 
       def add_socket(socket)
@@ -323,24 +353,29 @@ module Ione
         end
       end
 
-      def schedule_timer(timeout, promise=Promise.new)
+      def schedule_timer(timeout)
         @lock.lock
-        timers = @timers.reject { |pair| pair[1].nil? }
-        timers << [@clock.now + timeout, promise]
-        @timers = timers
-        promise.future
+        timer = Timer.new(@clock.now + timeout)
+        @timer_queue << timer
+        @pending_timers[timer.future] = timer
+        timer.future
       ensure
         @lock.unlock
       end
 
       def cancel_timer(timer_future)
+        timer = nil
         @lock.lock
-        timer_pair = @timers.find { |pair| (p = pair[1]) && p.future == timer_future }
-        @timers = @timers.reject { |pair| pair[1].nil? || pair == timer_pair }
-        timer_pair && timer_pair[1].fail(CancelledError.new)
-        nil
-      ensure
-        @lock.unlock
+        begin
+          if (timer = @pending_timers.delete(timer_future))
+            @timer_queue.delete(timer)
+          end
+        ensure
+          @lock.unlock
+        end
+        if timer
+          timer.fail(CancelledError.new)
+        end
       end
 
       def close_sockets
@@ -354,11 +389,9 @@ module Ione
       end
 
       def cancel_timers
-        @timers.each do |pair|
-          if pair[1]
-            pair[1].fail(CancelledError.new)
-            pair[1] = nil
-          end
+        while (timer = @timer_queue.pop)
+          @pending_timers.delete(timer.future)
+          timer.fail(CancelledError.new)
         end
       end
 
@@ -392,11 +425,22 @@ module Ione
       end
 
       def check_timers!
-        timers = @timers
-        timers.each do |pair|
-          if pair[1] && pair[0] <= @clock.now
-            pair[1].fulfill
-            pair[1] = nil
+        now = @clock.now
+        first_timer = @timer_queue.peek
+        if first_timer && first_timer.time <= now
+          expired_timers = []
+          @lock.lock
+          begin
+            while (timer = @timer_queue.peek) && timer.time <= now
+              @timer_queue.pop
+              @pending_timers.delete(timer.future)
+              expired_timers << timer
+            end
+          ensure
+            @lock.unlock
+          end
+          expired_timers.each do |timer|
+            timer.fulfill
           end
         end
       end

data/lib/ione/version.rb

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

data/spec/ione/heap_spec.rb

@@ -0,0 +1,160 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+
+module Ione
+  describe Heap do
+    let :heap do
+      described_class.new
+    end
+
+    describe '#size' do
+      it 'is zero when the heap is empty' do
+        heap.size.should be_zero
+      end
+
+      it 'returns the number of items in the heap' do
+        heap.push(13)
+        heap.push(100)
+        heap.size.should == 2
+        heap.push(101)
+        heap.size.should == 3
+      end
+    end
+
+    describe '#empty?' do
+      it 'returns true when there are no items in the heap' do
+        heap.should be_empty
+      end
+
+      it 'returns false when there are items in the heap' do
+        heap.push(1)
+        heap.should_not be_empty
+      end
+    end
+
+    describe '#push' do
+      it 'adds items to the heap' do
+        heap.push(4)
+        heap.push(3)
+        heap.push(6)
+        heap.push(5)
+        heap.size.should == 4
+      end
+
+      it 'is aliase as #<<' do
+        heap << 4
+        heap << 3
+        heap << 6
+        heap << 5
+        heap.size.should == 4
+      end
+    end
+
+    describe '#peek' do
+      it 'returns nil when there are no items in the heap' do
+        heap.peek.should be_nil
+      end
+
+      it 'returns the only item when there is only one' do
+        heap.push(3)
+        heap.peek.should == 3
+      end
+
+      it 'returns the smallest item' do
+        heap.push(10)
+        heap.push(3)
+        heap.push(7)
+        heap.peek.should == 3
+      end
+
+      it 'does not remove the item from the heap' do
+        heap.push(3)
+        heap.peek.should == 3
+        heap.peek.should == 3
+        heap.peek.should == 3
+      end
+    end
+
+    describe '#pop' do
+      it 'returns nil when there are no items in the heap' do
+        heap.pop.should be_nil
+      end
+
+      it 'returns and removes the only item when there is only one' do
+        heap.push(3)
+        heap.pop.should == 3
+        heap.should be_empty
+      end
+
+      it 'returns and removes the smallest item' do
+        heap.push(10)
+        heap.push(3)
+        heap.push(7)
+        heap.pop.should == 3
+        heap.pop.should == 7
+        heap.size.should == 1
+      end
+
+      it 'removes the item from the heap' do
+        heap.push(3)
+        heap.pop.should == 3
+        heap.pop.should be_nil
+      end
+
+      it 'returns each duplicate' do
+        heap.push(3)
+        heap.push(4)
+        heap.push(3)
+        heap.push(3)
+        heap.pop.should == 3
+        heap.pop.should == 3
+        heap.pop.should == 3
+        heap.pop.should == 4
+      end
+    end
+
+    describe '#delete' do
+      it 'removes the item from a heap with one item' do
+        heap.push(3)
+        heap.delete(3)
+        heap.should be_empty
+      end
+
+      it 'removes the item from the heap' do
+        heap.push(4)
+        heap.push(3)
+        heap.push(100)
+        heap.push(101)
+        heap.delete(4)
+        heap.pop
+        heap.peek.should == 100
+        heap.size.should == 2
+      end
+
+      it 'returns the item' do
+        heap.push(3)
+        heap.push(4)
+        heap.push(5)
+        heap.delete(4).should == 4
+      end
+
+      it 'returns nil when the item is not found' do
+        heap.push(3)
+        heap.push(4)
+        heap.push(5)
+        heap.delete(6).should be_nil
+      end
+
+      it 'removes the first instance of the item from the heap' do
+        heap.push(3)
+        heap.push(3)
+        heap.push(5)
+        heap.delete(3).should == 3
+        heap.delete(3).should == 3
+        heap.size.should == 1
+      end
+    end
+  end
+end

data/spec/ione/io/io_reactor_spec.rb

@@ -435,25 +435,22 @@ module Ione
         it 'completes timers that have expired' do
           selector.stub(:select).and_return([nil, nil, nil])
           clock.stub(:now).and_return(1)
-          promise = Promise.new
-          loop_body.schedule_timer(1, promise)
+          future = loop_body.schedule_timer(1)
           loop_body.tick
-          promise.future.should_not be_completed
+          future.should_not be_completed
           clock.stub(:now).and_return(2)
           loop_body.tick
-          promise.future.should be_completed
+          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)
-          promise = Promise.new
-          loop_body.schedule_timer(1, promise)
+          future = loop_body.schedule_timer(1)
           clock.stub(:now).and_return(2)
           loop_body.tick
-          promise.future.should be_completed
-          promise.should_not_receive(:fulfill)
-          loop_body.tick
+          future.should be_completed
+          expect { loop_body.tick }.to_not raise_error
         end
       end
 
@@ -492,20 +489,17 @@ module Ione
         end
 
         it 'fails all active timers with a CancelledError' do
-          p1 = Promise.new
-          p2 = Promise.new
-          p3 = Promise.new
           clock.stub(:now).and_return(1)
-          loop_body.schedule_timer(1, p1)
-          loop_body.schedule_timer(3, p2)
-          loop_body.schedule_timer(3, p3)
+          f1 = loop_body.schedule_timer(1)
+          f2 = loop_body.schedule_timer(3)
+          f3 = loop_body.schedule_timer(3)
           clock.stub(:now).and_return(2)
           loop_body.tick
           loop_body.cancel_timers
-          p1.future.should be_completed
-          p2.future.should be_failed
-          p3.future.should be_failed
-          expect { p3.future.value }.to raise_error(CancelledError)
+          f1.should be_completed
+          f2.should be_failed
+          f3.should be_failed
+          expect { f3.value }.to raise_error(CancelledError)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre4
+  version: 1.2.0.pre5
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer
@@ -23,6 +23,7 @@ files:
 - lib/ione.rb
 - lib/ione/byte_buffer.rb
 - lib/ione/future.rb
+- lib/ione/heap.rb
 - lib/ione/io.rb
 - lib/ione/io/acceptor.rb
 - lib/ione/io/base_connection.rb
@@ -37,6 +38,7 @@ files:
 - spec/integration/ssl_spec.rb
 - spec/ione/byte_buffer_spec.rb
 - spec/ione/future_spec.rb
+- spec/ione/heap_spec.rb
 - spec/ione/io/acceptor_spec.rb
 - spec/ione/io/connection_common.rb
 - spec/ione/io/connection_spec.rb
@@ -77,6 +79,7 @@ test_files:
 - spec/integration/ssl_spec.rb
 - spec/ione/byte_buffer_spec.rb
 - spec/ione/future_spec.rb
+- spec/ione/heap_spec.rb
 - spec/ione/io/acceptor_spec.rb
 - spec/ione/io/connection_common.rb
 - spec/ione/io/connection_spec.rb