zmachine 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 219aed15ccbcbb2ea4f9e83d0d686107cf13c5fb
-  data.tar.gz: 3bea68dd63ef8b91582f6d62ee69114bf4888d1f
+  metadata.gz: b5e36adcf8fc731b92bdc5d54272901f14caaf5d
+  data.tar.gz: f51726dae520643f03491643bd2ed65c11d9cad2
 SHA512:
-  metadata.gz: ac07ecb821f35b73fe173f83ef9220323d42a9af6af09012e25cac8a75042e68ee59d71894bfb2496e09cf90857053ba09de359964acfa94bf5c383208f2d9ef
-  data.tar.gz: 2f20659edb1c266d058e625da024e9eaf5f1f9c536cbc48430a18d6375cfd914bd457aac3da0c4bf98f04f04c85da587c4af5215874f2f449cd649382301b850
+  metadata.gz: 10c3cd9dfab40a3bdbaae428bd168aa99f5ce9536778f31d627d2ce6bb1e6986f83316d55d01eefe70235573264d47852cdd8bf3bd104fc3edc2ea16dd209205
+  data.tar.gz: c5d87d4b03ac6fbfa883abe2e9850bd2cedaa2bcacfdac2a0a68105afa260a6da5bdd104844140a22ddb1fe833de3352ccee1fe46565a9cb17a6b151ec1dcf5c

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'liquid-development'
-gem 'liquid-ext'
+gem 'liquid-ext', github: 'liquidm/ext'
 gem 'ruby-debug'
-gem 'z-http-request', path: '../z-http-request'
+gem 'z-http-request', github: 'liquidm/z-http-request'

data/java/com/liquidm/zmachine/HashedWheel.java

@@ -3,30 +3,51 @@ package com.liquidm.zmachine;
 import java.lang.System;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.concurrent.Callable;
 
 public class HashedWheel
 {
-	private class Timeout
+	private class Timeout implements Comparable<Timeout>
 	{
-		long deadline;
-		Object callback;
-		boolean canceled;
+		private long deadline;
+		private Callable<Object> callback;
+		private boolean canceled;
 
-		public Timeout(long deadline, Object callback)
+		public Timeout(long deadline, Callable<Object> callback)
 		{
 			this.deadline = deadline;
 			this.callback = callback;
 			this.canceled = false;
 		}
 
+		public int compareTo(Timeout other)
+		{
+			return (int)(this.deadline - other.getDeadline());
+		}
+
+		public long getDeadline()
+		{
+			return this.deadline;
+		}
+
 		public Object getCallback()
 		{
 			return this.callback;
 		}
 
+		public void call() throws Exception
+		{
+			if (this.callback != null) {
+				this.callback.call();
+				this.cancel();
+			}
+		}
+
 		public void cancel()
 		{
+			this.callback = null;
 			this.canceled = true;
 		}
 
@@ -37,9 +58,11 @@ public class HashedWheel
 	}
 
 	int number_of_slots;
+	ArrayList<SortedSet<Timeout>> slots;
+
 	long tick_length;
-	Object[] slots;
 	int current_tick;
+
 	long last;
 
 	public HashedWheel(int number_of_slots, long tick_length)
@@ -49,8 +72,7 @@ public class HashedWheel
 		reset();
 	}
 
-	@SuppressWarnings("unchecked")
-	public Object[] getSlots()
+	public ArrayList<SortedSet<Timeout>> getSlots()
 	{
 		return this.slots;
 	}
@@ -61,15 +83,15 @@ public class HashedWheel
 	}
 
 	@SuppressWarnings("unchecked")
-	public Timeout add(long timeout, Object callback)
+	public Timeout add(long timeout, Callable<Object> callback)
 	{
 		timeout = timeout * 1000000; // ms to ns
+		long deadline = System.nanoTime() + timeout;
 		long ticks = timeout / this.tick_length;
 		int slot = (int)((this.current_tick + ticks) % this.number_of_slots);
-		long deadline = System.nanoTime() + timeout;
 		Timeout hwt = new Timeout(deadline, callback);
-		ArrayList<Timeout> list = (ArrayList<Timeout>) this.slots[slot];
-		list.add(hwt);
+		SortedSet<Timeout> timeouts = this.slots.get(slot);
+		timeouts.add(hwt);
 		return hwt;
 	}
 
@@ -80,41 +102,42 @@ public class HashedWheel
 
 	public long reset(long last)
 	{
-		this.slots = new Object[this.number_of_slots];
+		this.slots = new ArrayList<SortedSet<Timeout>>(this.number_of_slots);
 		for (int i = 0; i < this.number_of_slots; i++) {
-			this.slots[i] = new ArrayList<Timeout>();
+			this.slots.add(i, new TreeSet<Timeout>());
 		}
 		this.current_tick = 0;
 		this.last = last;
 		return last;
 	}
 
-	public ArrayList<Timeout> advance()
+	public int advance() throws Exception
 	{
 		return advance(System.nanoTime());
 	}
 
-	@SuppressWarnings("unchecked")
-	public ArrayList<Timeout> advance(long now)
+	public int advance(long now) throws Exception
 	{
+		int timedout = 0;
 		long passed_ticks = (now - this.last) / this.tick_length;
-		ArrayList<Timeout> result = new ArrayList<Timeout>();
 		do {
 			this.current_tick = this.current_tick % this.number_of_slots;
-			Iterator<Timeout> it = ((ArrayList<Timeout>)this.slots[this.current_tick]).iterator();
+			SortedSet<Timeout> timeouts = this.slots.get(this.current_tick);
+			Iterator<Timeout> it = timeouts.iterator();
 			while (it.hasNext()) {
 				Timeout timeout = it.next();
-				if (timeout.deadline < now) {
-					if (!timeout.isCanceled()) {
-						result.add(timeout);
-					}
-					it.remove();
+				long deadline = timeout.getDeadline();
+				if (deadline > now) {
+					break;
 				}
+				timedout++;
+				timeout.call();
+				it.remove();
 			}
 			this.current_tick += 1;
 			passed_ticks -= 1;
 		} while (passed_ticks > 0);
 		this.last = now;
-		return result;
+		return timedout;
 	}
 }

data/lib/zmachine.rb

@@ -1,6 +1,3 @@
-require 'zmachine/jeromq-0.3.2-SNAPSHOT.jar'
-java_import org.zeromq.ZContext
-
 require 'liquid/boot'
 
 require 'zmachine/connection'
@@ -24,8 +21,9 @@ module ZMachine
     Thread.current[:reactor] ||= Reactor.new
   end
 
+  # for backwards compat. please use ZContext.instance directly.
   def self.context
-    Thread.current[:context] ||= ZContext.new
+    ZContext.instance
   end
 
   def self.add_periodic_timer(*args, &block)

data/lib/zmachine/reactor.rb

@@ -122,7 +122,7 @@ module ZMachine
         @running = false
         Reactor.unregister_reactor(self)
         ZMachine.logger.debug("zmachine:reactor:#{__method__}", stop: :zcontext) if ZMachine.debug
-        ZMachine.context.destroy
+        ZContext.destroy
         ZMachine.clear_current_reactor
       end
     end
@@ -131,7 +131,7 @@ module ZMachine
       ZMachine.logger.debug("zmachine:reactor:#{__method__}") if ZMachine.debug
       run_deferred_callbacks
       return unless @run_reactor
-      run_timers
+      @wheel.advance
       return unless @run_reactor
       @connection_manager.cleanup
       if @connection_manager.idle?
@@ -172,14 +172,6 @@ module ZMachine
       end
     end
 
-    def run_timers
-      ZMachine.logger.debug("zmachine:reactor:#{__method__}") if ZMachine.debug
-      @wheel.advance.each do |timeout|
-        ZMachine.logger.info("zmachine:reactor:#{__method__}", callback: timeout.callback) if ZMachine.debug
-        timeout.callback.call
-      end
-    end
-
     def wakeup
       ZMachine.logger.debug("zmachine:reactor:#{__method__}") if ZMachine.debug
       @selector.wakeup if @selector

data/lib/zmachine/zmq_channel.rb

@@ -1,8 +1,3 @@
-require 'zmachine/jeromq-0.3.2-SNAPSHOT.jar'
-java_import org.zeromq.ZMsg
-java_import org.zeromq.ZMQ
-java_import org.zeromq.ZMQException
-
 require 'zmachine'
 require 'zmachine/channel'
 
@@ -42,7 +37,7 @@ module ZMachine
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @bound = true
       @connected = true
-      @socket = ZMachine.context.create_socket(type)
+      @socket = ZContext.create_socket(type)
       @socket.bind(address)
     end
 
@@ -58,7 +53,7 @@ module ZMachine
     def connect(address, type)
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @connection_pending = true
-      @socket = ZMachine.context.create_socket(type)
+      @socket = ZContext.create_socket(type)
       @socket.connect(address)
     end
 
@@ -84,34 +79,12 @@ module ZMachine
       data
     end
 
-    def send1(a)
-      @socket.send_byte_array(a, ZMQ::DONTWAIT)
-    end
-
-    def send2(a, b)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::DONTWAIT)
-    end
-
-    def send3(a, b, c)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(c, ZMQ::DONTWAIT)
-    end
-
-    def send4(a, b, c, d)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(c, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(d, ZMQ::DONTWAIT)
-    end
-
     def close!
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @closed = true
       @connected = false
       @bound = false
-      ZMachine.context.destroySocket(@socket)
+      ZContext.destroy_socket(@socket)
     end
 
     def closed?

data/spec/channel_spec.rb

@@ -106,7 +106,7 @@ describe TCPChannel do
   after(:each) do
     @client.close
     @server.close
-    ZMachine.context.destroy
+    ZContext.destroy
   end
 
   let(:data) { "foo".to_java_bytes }
@@ -157,7 +157,7 @@ describe ZMQChannel do
   after(:each) do
     @client.close
     @server.close
-    ZMachine.context.destroy
+    ZContext.destroy
   end
 
   let(:data) { "foo".to_java_bytes }

data/spec/connection_spec.rb

@@ -14,7 +14,7 @@ shared_examples_for "a Connection" do
   after(:each) do
     @client.close!
     @server.close!
-    ZMachine.context.destroy
+    ZContext.destroy
   end
 
   let(:data) { "foo" }

data/spec/hashed_wheel_spec.rb

@@ -20,7 +20,7 @@ describe ZMachine::HashedWheel do
     wheel.add 10
     wheel.add 50
     timedout = wheel.advance(now + 30 * 1_000_000)
-    expect(timedout.length).to eq(1)
+    expect(timedout).to eq(1)
   end
 
   it 'calculates the timeout set correctly' do
@@ -31,18 +31,17 @@ describe ZMachine::HashedWheel do
     wheel.add 3300
     wheel.add 4000
     timedout = wheel.advance(now + 3900 * 1_000_000)
-    expect(timedout).to be
-    expect(timedout.length).to eq(4)
+    expect(timedout).to eq(4)
   end
 
   it 'cancels timers correctly' do
     now = wheel.reset
-    t1 = wheel.add 90
-    t2 = wheel.add 110
-    t1.cancel
+    result = nil
+    wheel.add(90, -> { result = true })
+    wheel.add(110, -> { result = false }).cancel
     timedout = wheel.advance(now + 200 * 1_000_000)
-    expect(timedout.first).to eq(t2)
-    expect(timedout.length).to eq(1)
+    expect(result).to eq(true)
+    expect(timedout).to eq(2)
   end
 
 end

data/zmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.4.0"
+  spec.version       = "0.4.1"
   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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid-ext
@@ -54,7 +54,6 @@ files:
 - lib/zmachine/connection_manager.rb
 - lib/zmachine/deferrable.rb
 - lib/zmachine/hashed_wheel.rb
-- lib/zmachine/jeromq-0.3.2-SNAPSHOT.jar
 - lib/zmachine/reactor.rb
 - lib/zmachine/tcp_channel.rb
 - lib/zmachine/timers.rb