zmachine 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae108dc1b3349d10953fdbf480eb04399e955210
-  data.tar.gz: 0c21b76fea1dac030296db4af61132a4378f5c6c
+  metadata.gz: 8bfd7346cba3e70c873af45a7db7690424396720
+  data.tar.gz: ee92ca58e8ec0996531625d17bdb340c26b754e3
 SHA512:
-  metadata.gz: cf74518f087c16dbdc05982c3aae1beeea4e948995b83cdad5f77223cdcb0c6c90c1461df3c616ce5fa4713b337ed6f65736ece7c10874f3677239b38a6ee9b7
-  data.tar.gz: 1756c03d9be7a36ed549f8e954c74d8bf2614d7e9b1638b2bb9d343b4c4c566366aee682a05382a365754c72d630877db3242fa56ba5a9b76a2a9c85c8ffadc7
+  metadata.gz: d1031edf74c86b34f00d0c22ea4fc04fa36c4a54651ce7c5570f23b91713ad9f51bce3aec9a6c61e38d5cbbaa48588268497351c73f8cc1e5de5a86d21ff2072
+  data.tar.gz: 72171c7f7958bdfd3bf0e5f5bc0d419be6d9df3ec5d6b94d799f1db5cdaad70cf06477409d0741fbf522e512d4c6c3026d648df5595eb4d9c1294f345dd86604

data/lib/zmachine/channel.rb

@@ -1,4 +1,5 @@
-java_import java.nio.ByteBuffer
+java_import 'java.nio.ByteBuffer'
+java_import 'java.util.concurrent.ConcurrentLinkedQueue'
 
 module ZMachine
   class Channel
@@ -8,7 +9,7 @@ module ZMachine
 
     def initialize
       @inbound_buffer = ByteBuffer.allocate(1024 * 1024)
-      @outbound_queue = []
+      @outbound_queue = ConcurrentLinkedQueue.new
       @raw = false
     end
 
@@ -38,20 +39,21 @@ module ZMachine
       return unless data
       buffer = ByteBuffer.wrap(data)
       if buffer.has_remaining
-        @outbound_queue << buffer
+        @outbound_queue.add(buffer)
       end
     end
 
     def write_outbound_data
       ZMachine.logger.debug("zmachine:channel:#{__method__}", channel: self, can_send: can_send?) if ZMachine.debug
       while can_send?
-        buffer = @outbound_queue.first
+        buffer = @outbound_queue.peek
+        break unless buffer
         @socket.write(buffer) if buffer.has_remaining
         # Did we consume the whole outbound buffer? If yes,
         # pop it off and keep looping. If no, the outbound network
         # buffers are full, so break out of here.
         break if buffer.has_remaining
-        @outbound_queue.shift
+        @outbound_queue.poll
       end
       maybe_close_with_callback
     end

data/lib/zmachine/connection.rb

@@ -28,6 +28,7 @@ module ZMachine
       @channel = klass.new
       @channel.bind(address, port_or_type)
       @block = block
+      @block.call(self) if @block && @channel.is_a?(ZMQChannel)
       self
     end
 
@@ -165,7 +166,7 @@ module ZMachine
 
     def register(selector)
       ZMachine.logger.debug("zmachine:connection:#{__method__}", connection: self, fd: @channel.selectable_fd) if ZMachine.debug
-      @channel_key ||= @channel.selectable_fd.register(selector, current_events, self)
+      @channel_key = @channel.selectable_fd.register(selector, current_events, self)
     end
 
     def valid?

data/lib/zmachine/connection_manager.rb

@@ -2,6 +2,7 @@ java_import java.nio.channels.ClosedChannelException
 
 require 'zmachine/tcp_channel'
 require 'zmachine/zmq_channel'
+require 'set'
 
 module ZMachine
   class ConnectionManager
@@ -11,10 +12,10 @@ module ZMachine
     def initialize(selector)
       ZMachine.logger.debug("zmachine:connection_manager:#{__method__}") if ZMachine.debug
       @selector = selector
-      @connections = []
-      @zmq_connections = []
-      @new_connections = []
-      @unbound_connections = []
+      @connections = Set.new
+      @zmq_connections = Set.new
+      @new_connections = Set.new
+      @unbound_connections = Set.new
     end
 
     def idle?
@@ -81,7 +82,7 @@ module ZMachine
     end
 
     def add_new_connections
-      @new_connections.compact.each do |connection|
+      @new_connections.each do |connection|
         ZMachine.logger.debug("zmachine:connection_manager:#{__method__}", connection: connection) if ZMachine.debug
         begin
           connection.register(@selector)
@@ -97,6 +98,10 @@ module ZMachine
       @new_connections.clear
     end
 
+    def is_connected?(connection)
+      @connections.include?(connection)
+    end
+
     def cleanup
       return if @unbound_connections.empty?
       ZMachine.logger.debug("zmachine:connection_manager:#{__method__}") if ZMachine.debug
@@ -111,7 +116,7 @@ module ZMachine
           else
             connection.unbind
           end
-          connection.close
+          connection.channel.close!
         rescue Exception => e
           ZMachine.logger.exception(e, "failed to unbind connection") if ZMachine.debug
         end

data/lib/zmachine/hashed_wheel.rb

@@ -35,10 +35,10 @@ module ZMachine
     def add(timeout, &block)
       timeout *= 1_000_000_000 # s to ns
       ticks = timeout / @tick_length
-      slot  = (@current_tick + ticks) % @slots.length
-      HashedWheelTimeout.new(System.nano_time + timeout, &block).tap do |hwt|
-        @slots[slot] << hwt
-      end
+      slot = (@current_tick + ticks) % @slots.length
+      deadline = System.nano_time + timeout
+      @slots[slot] << hwt = HashedWheelTimeout.new(deadline, &block)
+      hwt
     end
 
     def reset(time = nil)

data/lib/zmachine/reactor.rb

@@ -92,9 +92,10 @@ module ZMachine
     end
 
     def reconnect(server, port_or_type, handler)
-      return if handler && handler.channel.is_a?(ZMQChannel)
+      return handler if handler && handler.channel.is_a?(ZMQChannel)
       ZMachine.logger.debug("zmachine:reactor:#{__method__}", server: server, port_or_type: port_or_type) if ZMachine.debug
-      @connection_manager.connect(server, port_or_type, handler)
+      return handler if handler.connected?
+      connect(server, port_or_type, handler)
     end
 
     def run(callback=nil, shutdown_hook=nil, &block)

data/lib/zmachine/tcp_channel.rb

@@ -21,7 +21,7 @@ module ZMachine
     end
 
     def bound?
-      @socket.is_a?(ServerSocketChannel) && @socket.bound?
+      @socket.is_a?(ServerSocketChannel) && @socket.socket.bound?
     end
 
     def accept
@@ -29,9 +29,9 @@ module ZMachine
       client_socket = @socket.accept
       return unless client_socket
       client_socket.configure_blocking(false)
-      TCPChannel.new.tap do |channel|
-        channel.socket = client_socket
-      end
+      channel = TCPChannel.new
+      channel.socket = client_socket
+      channel
     end
 
     def connect(address, port)

data/lib/zmachine/zmq_channel.rb

@@ -78,6 +78,7 @@ module ZMachine
 
     def read_inbound_data
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
+      return nil unless can_recv?
       data = ZMsg.recv_msg(@socket)
       data = String.from_java_bytes(data.first.data) unless @raw
       data

data/spec/channel_spec.rb

@@ -38,6 +38,7 @@ shared_examples_for "a Channel" do
     before(:each) do
       @channel = @server.accept
       @channel.raw = false
+      ZMQChannel.any_instance.stub(:can_recv?) { true }
       @client.finish_connecting
     end
 
@@ -84,7 +85,7 @@ shared_examples_for "a Channel" do
     end
 
     it 'closes the connection after writing' do
-      channel = @server.accept
+      @server.accept
       @client.finish_connecting
       @client.send_data(data)
       @client.close(true)

data/zmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.2"
   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.0
+  version: 0.3.2
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid-ext
@@ -45,7 +45,6 @@ files:
 - examples/echo_client.rb
 - examples/echo_server.rb
 - lib/zmachine.rb
-- lib/zmachine/acceptor.rb
 - lib/zmachine/channel.rb
 - lib/zmachine/connection.rb
 - lib/zmachine/connection_manager.rb
@@ -83,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key:
 specification_version: 4
 summary: pure JRuby multi-threaded mostly EventMachine compatible event loop

data/lib/zmachine/acceptor.rb

@@ -1,20 +0,0 @@
-module ZMachine
-  class Acceptor
-    attr_reader :klass
-    attr_reader :args
-    attr_reader :callback
-
-    def initialize(channel, klass, *args)
-      @klass, @args, @callback = klass, args[0...-1], args.last
-      @channel = channel
-    end
-
-    def unbind
-    end
-
-    def close
-      @channel.close
-    end
-
-  end
-end