zmachine 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODFlZWJhODg3YmM5NWMxYmJmZmRmNmM5ZGI0N2NkMzIzNWU3YjEwZg==
-  data.tar.gz: !binary |-
-    NGMyYTk4ZmIwODI5OWZlMjY1ZDQxYjRkYTBlZGJiZjAyZGY0MDY4Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTVjMmVhODBmZjU3NTA4MmQ4MDBkOTRlZmE4OTMzNjA4ZWM4NjgwZmM2ZWVm
-    YWRlYTM0Mzg0NTlhYzYwYzgyOWIwZmMzMzcyZTEzNDU2MjFjNGQyYjliMmFh
-    YzJmMWYwZWU5MTdjYmJmZjk0ZDgwZmQ2YzZhOGQxZjdmNTNmZTA=
-  data.tar.gz: !binary |-
-    OGRmZjQ3YWI2NTllOWI2MzQzODVhOGVjYzAzMjI5ZDgwNTQ3NTU4MjM4NjVk
-    Yjk5MzU0MmJmM2QwNjUxYzllZTZlMWIyMTVlMGM5OTE1YWZmOTA1OTIzZGRm
-    Y2VjYjI4N2JkNzRjOTcxNDgzMTA0NTU1YmM0ZWYwOWFmMzQ1M2I=
+SHA1:
+  metadata.gz: 47d9ec01f1c2e637dd7b8bd49e8df5ab2f6c9ec2
+  data.tar.gz: 9fea025ea55da57597fc31ecb8fc17055afcca9b
+SHA512:
+  metadata.gz: 3c2709abad08e6337fd8d930e71d7b1d970cd7add92ab40eee2574500de96cdad5bc8c09acb375dd4cd16cb67aa8f992f64db7b05a88eff0f8d92e6ced62c115
+  data.tar.gz: b0ad9bfe37a314ec281d61c1ff9eb1221153d1f199740ebde8acc9a9a755bbd5e7d25bdf66d3e18410ea2677f74e671093cdd177b0871ac346b42547a1378a44

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rspec

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.7.6

data/Gemfile

@@ -3,7 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in zmachine.gemspec
 gemspec
 
+gem 'awesome_print'
+gem 'brice'
+gem 'fuubar'
 gem 'ruby-debug'
 gem 'ruby-debug-ide'
-gem 'brice'
-gem 'awesome_print'
+gem 'madvertise-ext'
+gem 'simplecov'

data/README.md

@@ -1,6 +1,8 @@
 # Zmachine
 
-TODO: Write a gem description
+ZMachine is a JRuby Event Reactor based on java.nio.Selector and a HashedWheel
+timer implementation. ZMachine supports TCP and ZeroMQ sockets natively and
+exposes an EventMachine compatible API where possible.
 
 ## Installation
 

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+require "madvertise/tasks"

data/benchmarks/benchmark.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+bundle exec jruby \
+	--server \
+	-J-Djruby.compile.fastest=true \
+	-J-Djruby.compile.frameless=true \
+	-J-Djruby.compile.positionless=true \
+	-J-Djruby.compile.threadless=true \
+	-J-Djruby.compile.fastops=true \
+	-J-Djruby.compile.fastcase=true \
+	-J-Djruby.compile.invokedynamic=true \
+	"$@" | pv -l >/dev/null

data/benchmarks/tcp_channel.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'zmachine/tcp_channel'
+
+include ZMachine
+
+server = TCPChannel.new
+server.bind("0.0.0.0", 12345)
+
+client = TCPChannel.new
+client.connect("0.0.0.0", 12345)
+
+channel = server.accept
+client.finish_connecting
+
+data = ("x" * 2048).freeze
+
+loop do
+  client.send_data(data)
+  client.write_outbound_data
+  received = channel.read_inbound_data
+  puts received
+  channel.send_data(received)
+  channel.write_outbound_data
+  client.read_inbound_data
+end

data/benchmarks/zmq_channel.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require 'zmachine/zmq_channel'
+
+include ZMachine
+
+server = ZMQChannel.new(ZMQ::REP)
+#server.bind("tcp://0.0.0.0:12345")
+server.bind("inproc://x")
+
+client = ZMQChannel.new(ZMQ::REQ)
+#client.connect("tcp://0.0.0.0:12345")
+client.connect("inproc://x")
+
+data = ("x" * 2048).to_java_bytes
+
+loop do
+  client.send_data([data])
+  received = server.read_inbound_data.first
+  puts received
+  server.send_data([data])
+  client.read_inbound_data
+end

data/echo_client.rb

@@ -2,11 +2,12 @@
 
 require 'rubygems'
 require 'bundler/setup'
+require 'madvertise/boot'
 require 'zmachine'
 
-java_import org.zeromq.ZMQ
-java_import org.zeromq.ZMsg
-java_import org.zeromq.ZFrame
+$log.level = :debug
+ZMachine.logger = $log
+ZMachine.debug = true
 
 #set_trace_func proc { |event, file, line, id, binding, classname|
 #  printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
@@ -44,28 +45,9 @@ class TCPEcho < ZMachine::Connection
   end
 end
 
-ZMachine.run {
-  ZMachine.connect("tcp://127.0.0.1:10000", ZMQ::ROUTER, ZMQEcho) do |handler|
-    handler.channel.identity = "client"
-  end
-  #ZMachine.connect("127.0.0.1", 10000, TCPEcho)
-}
-
-#ctx = ZContext.new
-#socket = ctx.create_socket(ZMQ::ROUTER)
-#socket.connect("tcp://127.0.0.1:10000")
-#socket.identity = "client".to_java_bytes
-
-#sleep(1)
-
-#loop do
-#  msg = ZMsg.new_string_msg($i.to_s)
-#  msg.wrap(ZFrame.new("server"))
-#  msg.java_send(:send, [org.zeromq.ZMQ::Socket], socket)
-#  $i += 1
-#  break if $i > 100
-#  #puts ZMsg.recvMsg(socket).inspect
-#end
-
-#socket.close
-#ctx.destroy
+ZMachine.run do
+  #ZMachine.connect("tcp://127.0.0.1:10000", ZMQ::ROUTER, ZMQEcho) do |handler|
+  #  handler.channel.identity = "client"
+  #end
+  ZMachine.connect("127.0.0.1", 10000, TCPEcho)
+end

data/echo_server.rb

@@ -2,40 +2,33 @@
 
 require 'rubygems'
 require 'bundler/setup'
+require 'madvertise/boot'
 require 'zmachine'
 
-java_import org.zeromq.ZMQ
-java_import org.zeromq.ZFrame
+$log.level = :debug
+ZMachine.logger = $log
+ZMachine.debug = true
 
 #set_trace_func proc { |event, file, line, id, binding, classname|
 #  printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
 #}
 
-class EchoServer < ZMachine::Connection
-  def receive_data(msg)
-    origin = msg.unwrap
-    puts "recv(#{msg.to_a.map {|f| String.from_java_bytes(f.data) }.inspect})"
-    msg = ZMsg.new_string_msg("ok")
-    msg.wrap(origin)
-    send_data(msg)
+class ZMQEchoServer < ZMachine::Connection
+  def receive_data(buffer)
+    send_data(buffer)
+  end
+end
+
+class TCPEchoServer < ZMachine::Connection
+  def receive_data(buffer)
+    send_data(buffer)
   end
 end
 
 ZMachine.run do
-  ZMachine.start_server("tcp://*:10000", ZMQ::ROUTER, EchoServer) do |handler|
+  ZMachine.start_server("tcp://*:10000", ZMQ::ROUTER, ZMQEchoServer) do |handler|
     handler.channel.identity = "server"
   end
-  #ZMachine.start_server("0.0.0.0", 10000, EchoServer)
+  #ZMachine.start_server("0.0.0.0", 10000, TCPEchoServer)
   puts "machine running"
 end
-
-#ctx = ZContext.new
-#socket = ctx.create_socket(ZMQ::ROUTER)
-#socket.bind("tcp://127.0.0.1:10000")
-#socket.identity = "server".to_java_bytes
-
-#loop do
-#  puts socket.events.inspect
-#  msg = ZMsg.recvMsg(socket)
-#  puts "recv(#{msg.to_a.map {|f| String.from_java_bytes(f.data) }.inspect})"
-#end

data/lib/zmachine.rb

@@ -1,11 +1,13 @@
-require 'forwardable'
+require 'zmachine/jeromq-0.3.0-SNAPSHOT.jar'
+java_import org.zeromq.ZContext
+
+require 'madvertise/boot'
 
 require 'zmachine/connection'
 require 'zmachine/deferrable'
 require 'zmachine/reactor'
 require 'zmachine/timers'
 
-
 module ZMachine
   class ConnectionError < RuntimeError; end
   class ConnectionNotBound < RuntimeError; end
@@ -25,27 +27,11 @@ module ZMachine
     Thread.current[:reactor] ||= Reactor.new
   end
 
+  # TODO: move to ZMQChannel
   def self.context
     Thread.current[:context] ||= ZContext.new
   end
 
-  class << self
-    extend Forwardable
-    def_delegator :reactor, :add_shutdown_hook
-    def_delegator :reactor, :add_timer
-    def_delegator :reactor, :cancel_timer
-    def_delegator :reactor, :connect
-    def_delegator :reactor, :connection_count
-    def_delegator :reactor, :error_handler
-    def_delegator :reactor, :next_tick
-    def_delegator :reactor, :run
-    def_delegator :reactor, :reactor_running?
-    def_delegator :reactor, :reconnect
-    def_delegator :reactor, :start_server
-    def_delegator :reactor, :stop_event_loop
-    def_delegator :reactor, :stop_server
-  end
-
   def self._not_implemented
     raise RuntimeError.new("API call not implemented! #{caller[0]}")
   end
@@ -56,6 +42,14 @@ module ZMachine
     PeriodicTimer.new(interval, callback)
   end
 
+  def self.add_shutdown_hook(&block)
+    reactor.add_shutdown_hook(&block)
+  end
+
+  def self.add_timer(*args, &block)
+    reactor.add_timer(*args, &block)
+  end
+
   def self.attach(io, handler = nil, *args, &blk)
     _not_implemented
   end
@@ -68,10 +62,26 @@ module ZMachine
     _not_implemented
   end
 
+  def self.cancel_timer(timer_or_sig)
+    timer_or_sig.cancel # we do not support signatures
+  end
+
+  def self.close_connection(connection)
+    reactor.close_connection(connection)
+  end
+
+  def self.connect(server, port_or_type=nil, handler=nil, *args, &block)
+    reactor.connect(server, port_or_type, handler, *args, &block)
+  end
+
   def self.connect_unix_domain(socketname, *args, &blk)
     _not_implemented
   end
 
+  def self.connection_count
+    reactor.connections.size
+  end
+
   def self.defer(op = nil, callback = nil, &blk)
     _not_implemented
   end
@@ -88,6 +98,10 @@ module ZMachine
     _not_implemented
   end
 
+  def self.error_handler(callback = nil, &block)
+    _not_implemented
+  end
+
   def self.fork_reactor(&block)
     _not_implemented
   end
@@ -97,11 +111,15 @@ module ZMachine
   end
 
   def self.heartbeat_interval
-    _not_implemented
+    reactor.heartbeat_interval
   end
 
   def self.heartbeat_interval=(time)
-    _not_implemented
+    reactor.heartbeat_interval = time
+  end
+
+  def self.next_tick(callback=nil, &block)
+    reactor.next_tick(callback, &block)
   end
 
   def self.open_datagram_socket(address, port, handler = nil, *args)
@@ -112,12 +130,20 @@ module ZMachine
     _not_implemented
   end
 
+  def self.reactor_running?
+    reactor.running?
+  end
+
   def self.reactor_thread?
     _not_implemented
   end
 
-  def self.stop
-    Reactor.terminate_all_reactors
+  def self.reconnect(server, port, handler)
+    reactor.reconnect(server, port, handler)
+  end
+
+  def self.run(callback=nil, shutdown_hook=nil, &block)
+    reactor.run(callback, shutdown_hook, &block)
   end
 
   def self.run_block(&block)
@@ -152,10 +178,26 @@ module ZMachine
     _not_implemented
   end
 
+  def self.start_server(server, port_or_type=nil, handler=nil, *args, &block)
+    reactor.bind(server, port_or_type, handler, *args, &block)
+  end
+
   def self.start_unix_domain_server(filename, *args, &block)
     _not_implemented
   end
 
+  def self.stop_event_loop
+    reactor.stop_event_loop
+  end
+
+  def self.stop_server(signature)
+    reactor.stop_server(signature)
+  end
+
+  def self.stop
+    Reactor.terminate_all_reactors
+  end
+
   def self.system(cmd, *args, &cb)
     _not_implemented
   end
@@ -177,3 +219,9 @@ module ZMachine
   end
 
 end
+
+if ENV['DEBUG']
+  $log.level = :debug
+  ZMachine.logger = $log
+  ZMachine.debug = true
+end

data/lib/zmachine/channel.rb

@@ -1,42 +1,44 @@
+java_import java.nio.ByteBuffer
+
 module ZMachine
   class Channel
 
     attr_accessor :socket
-    attr_reader   :selector
-    attr_accessor :handler
-    attr_accessor :reactor
-
-    attr_reader :comm_inactivity_timeout
-    attr_reader :last_comm_activity
 
-    def initialize(selector)
-      @selector = selector
+    def initialize
+      @inbound_buffer = ByteBuffer.allocate(1024 * 1024)
       @outbound_queue = []
-      @comm_inactivity_timeout = 0
-      @timedout = false
-      mark_active!
-    end
-
-    # assigned in seconds!!
-    def comm_inactivity_timeout=(value)
-      # we are in nanos
-      @comm_inactivity_timeout = value * 1000_000_000
-    end
-
-    def mark_active!
-      @last_comm_activity = System.nano_time
+      @close_scheduled = false
     end
 
-    def timedout?
-      @timedout
+    # methods that need to be implemented in sub classes:
+    #
+    # selectable_fd
+    # bind(address, port = nil)
+    # bound?
+    # accept
+    # connect(address, port = nil)
+    # connection_pending?
+    # finish_connecting
+    # connected?
+    # read_inbound_data
+    # send_data(data)
+    # closed?
+    # peer
+    # write_outbound_data
+
+    def can_send?
+      !@outbound_queue.empty?
     end
 
-    def timedout!
-      @timedout = true
+    def close(after_writing = false)
+      ZMachine.logger.debug("zmachine:channel:#{__method__}", channel: self, after_writing: after_writing) if ZMachine.debug
+      @close_scheduled = true
+      @outbound_queue.clear unless after_writing
     end
 
-    def was_active?(now)
-      @last_comm_activity + @comm_inactivity_timeout >= now
+    def close_after_writing
+      close(true)
     end
 
   end