zmachine 0.3.2 → 0.4.0

data/lib/zmachine/tcp_channel.rb

@@ -8,6 +8,11 @@ require 'zmachine/channel'
 module ZMachine
   class TCPChannel < Channel
 
+    def initialize
+      super
+      @buffer = Thread.current[:tcp_channel_buffer] ||= ByteBuffer.allocate(1024 * 1024)
+    end
+
     def selectable_fd
       @socket
     end
@@ -60,17 +65,17 @@ module ZMachine
     end
 
     def connected?
+      return false if @socket.is_a?(ServerSocketChannel)
       @socket.connected?
     end
 
     def read_inbound_data
       ZMachine.logger.debug("zmachine:tcp_channel:#{__method__}", channel: self) if ZMachine.debug
-      buffer = @inbound_buffer
-      buffer.clear
-      raise IOException.new("EOF") if @socket.read(buffer) == -1
-      buffer.flip
-      return if buffer.limit == 0
-      data = buffer.array[buffer.position...buffer.limit]
+      @buffer.clear
+      raise IOException.new("EOF") if @socket.read(@buffer) == -1
+      @buffer.flip
+      return if @buffer.limit == 0
+      data = java.util.Arrays.copyOfRange(@buffer.array, @buffer.position, @buffer.limit)
       data = String.from_java_bytes(data) unless @raw
       data
     end

data/spec/channel_spec.rb

@@ -44,7 +44,7 @@ shared_examples_for "a Channel" do
 
     it 'writes outbound buffers to the socket' do
       @client.send_data(data)
-      expect(@client.write_outbound_data).to eq(true)
+      expect(@client.can_send?).to eq(true)
     end
 
     it 'receives data sent from the client' do
@@ -84,16 +84,6 @@ shared_examples_for "a Channel" do
       expect(channel).to be_closed
     end
 
-    it 'closes the connection after writing' do
-      @server.accept
-      @client.finish_connecting
-      @client.send_data(data)
-      @client.close(true)
-      expect(@client).to be_connected
-      @client.write_outbound_data
-      expect(@client).not_to be_connected
-    end
-
   end
 
 end
@@ -135,9 +125,9 @@ describe TCPChannel do
       channel = @server.accept
       @client.finish_connecting
       channel.send_data(data)
-      channel.close(true)
-      expect(channel).to be_connected
       channel.write_outbound_data
+      expect(channel).to be_connected
+      channel.close
       expect(channel).not_to be_connected
       expect(@client).to be_connected
       @client.read_inbound_data

data/spec/connection_spec.rb

@@ -12,8 +12,8 @@ shared_examples_for "a Connection" do
   end
 
   after(:each) do
-    @client.close
-    @server.close
+    @client.close!
+    @server.close!
     ZMachine.context.destroy
   end
 

data/spec/hashed_wheel_spec.rb

@@ -1,19 +1,15 @@
 require 'zmachine/hashed_wheel'
 
 describe ZMachine::HashedWheel do
-  let(:wheel) { ZMachine::HashedWheel.new(16, 0.1) }
-
-  it 'returns a timeout on add' do
-    expect(wheel.add(0)).to be_instance_of(ZMachine::HashedWheelTimeout)
-  end
+  let(:wheel) { ZMachine::HashedWheel.new(16, 100) }
 
   it 'adds timeouts to the correct slot' do
     wheel.add 0
-    wheel.add 0.090
-    wheel.add 0.110
-    wheel.add 1.000
-    wheel.add 1.600
-    wheel.add 3.200
+    wheel.add 90
+    wheel.add 110
+    wheel.add 1000
+    wheel.add 1600
+    wheel.add 3200
     expect(wheel.slots[0].length).to eq(4)
     expect(wheel.slots[1].length).to eq(1)
     expect(wheel.slots[10].length).to eq(1)
@@ -21,19 +17,19 @@ describe ZMachine::HashedWheel do
 
   it 'times out same slot timeouts correctly' do
     now = wheel.reset
-    wheel.add 0.01
-    wheel.add 0.05
+    wheel.add 10
+    wheel.add 50
     timedout = wheel.advance(now + 30 * 1_000_000)
     expect(timedout.length).to eq(1)
   end
 
   it 'calculates the timeout set correctly' do
     now = wheel.reset
-    wheel.add 0.010
-    wheel.add 0.040
-    wheel.add 1.900
-    wheel.add 3.300
-    wheel.add 4.000
+    wheel.add 10
+    wheel.add 40
+    wheel.add 1900
+    wheel.add 3300
+    wheel.add 4000
     timedout = wheel.advance(now + 3900 * 1_000_000)
     expect(timedout).to be
     expect(timedout.length).to eq(4)
@@ -41,11 +37,11 @@ describe ZMachine::HashedWheel do
 
   it 'cancels timers correctly' do
     now = wheel.reset
-    t1 = wheel.add 0.090
-    t2 = wheel.add 0.110
+    t1 = wheel.add 90
+    t2 = wheel.add 110
     t1.cancel
     timedout = wheel.advance(now + 200 * 1_000_000)
-    expect(timedout).to eq([t2])
+    expect(timedout.first).to eq(t2)
     expect(timedout.length).to eq(1)
   end
 

data/zmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.3.2"
+  spec.version       = "0.4.0"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.description   = %q{pure JRuby multi-threaded mostly EventMachine compatible event loop}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zmachine
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid-ext
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .jrubyrc
 - .rspec
 - .ruby-version
 - .travis.yml
@@ -44,6 +45,9 @@ files:
 - benchmarks/zmq_channel.rb
 - examples/echo_client.rb
 - examples/echo_server.rb
+- java/com/liquidm/zmachine/HashedWheel$Timeout.class
+- java/com/liquidm/zmachine/HashedWheel.class
+- java/com/liquidm/zmachine/HashedWheel.java
 - lib/zmachine.rb
 - lib/zmachine/channel.rb
 - lib/zmachine/connection.rb
@@ -82,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: pure JRuby multi-threaded mostly EventMachine compatible event loop