zmachine 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e36adcf8fc731b92bdc5d54272901f14caaf5d
-  data.tar.gz: f51726dae520643f03491643bd2ed65c11d9cad2
+  metadata.gz: 678962082b59e5cd14cafa1854e9824d7b92635d
+  data.tar.gz: 89c609b6ea82d80371806d62974ae25baab8ad59
 SHA512:
-  metadata.gz: 10c3cd9dfab40a3bdbaae428bd168aa99f5ce9536778f31d627d2ce6bb1e6986f83316d55d01eefe70235573264d47852cdd8bf3bd104fc3edc2ea16dd209205
-  data.tar.gz: c5d87d4b03ac6fbfa883abe2e9850bd2cedaa2bcacfdac2a0a68105afa260a6da5bdd104844140a22ddb1fe833de3352ccee1fe46565a9cb17a6b151ec1dcf5c
+  metadata.gz: 06a8730505de6a152fe7d3302b416cb040a3df5c2daa11c75ee0a3b4f4740ec44f3b013438666b63e0b3997e6b5a61fbd3ce1be5c24abac8f8917df38ac68a5d
+  data.tar.gz: 080046c1498d52f1052200dbfb5dcf0b80a12f357728bb9bd55fffac4bbdb2b38b2899912061658ba56d07b6917b4f393408b3c8c6997acc8619b53bc6375121

data/lib/zmachine.rb

@@ -13,8 +13,8 @@ module ZMachine
     attr_accessor :debug
   end
 
-  def self.clear_current_reactor
-    Thread.current[:reactor] = nil
+  def self.reactor=(value)
+    Thread.current[:reactor] = value
   end
 
   def self.reactor
@@ -100,10 +100,6 @@ module ZMachine
     reactor.stop_server(signature)
   end
 
-  def self.stop
-    Reactor.terminate_all_reactors
-  end
-
 end
 
 if ENV['DEBUG']

data/lib/zmachine/reactor.rb

@@ -12,28 +12,6 @@ module ZMachine
 
   class Reactor
 
-    @mutex = Mutex.new
-
-    def self.register_reactor(reactor)
-      @mutex.synchronize do
-        @reactors ||= []
-        @reactors << reactor
-      end
-    end
-
-    def self.terminate_all_reactors
-      @mutex.synchronize do
-        @reactors.each(&:stop_event_loop)
-        @reactors.clear
-      end
-    end
-
-    def self.unregister_reactor(reactor)
-      @mutex.synchronize do
-        @reactors.delete(reactor)
-      end
-    end
-
     def initialize
       @heartbeat_interval = ZMachine.heartbeat_interval || 0.5 # coarse grained by default
       @next_tick_queue = ConcurrentLinkedQueue.new
@@ -101,7 +79,7 @@ module ZMachine
       ZMachine.logger.debug("zmachine:reactor:#{__method__}") if ZMachine.debug
       add_shutdown_hook(shutdown_hook) if shutdown_hook
       begin
-        Reactor.register_reactor(self)
+        Signal.register_shutdown_handler { self.stop_event_loop }
         @running = true
         if callback = (callback || block)
           add_timer(0) { callback.call(self) }
@@ -120,10 +98,8 @@ module ZMachine
         @shutdown_hooks.pop.call until @shutdown_hooks.empty?
         @next_tick_queue = ConcurrentLinkedQueue.new
         @running = false
-        Reactor.unregister_reactor(self)
         ZMachine.logger.debug("zmachine:reactor:#{__method__}", stop: :zcontext) if ZMachine.debug
-        ZContext.destroy
-        ZMachine.clear_current_reactor
+        ZMachine.reactor = nil
       end
     end
 

data/lib/zmachine/zmq_channel.rb

@@ -1,21 +1,6 @@
 require 'zmachine'
 require 'zmachine/channel'
 
-class ZMQ
-  class Socket
-    # for performance reason we alias the method here (otherwise it uses reflections all the time!)
-    # super ugly, since we need to dynamically infer the java class of byte[]
-    java_alias :send_byte_buffer, :sendByteBuffer, [Java::JavaNio::ByteBuffer.java_class, Java::int]
-    java_alias :send_byte_array, :send, [[].to_java(:byte).java_class, Java::int]
-    java_alias :recv_byte_array, :recv, [Java::int]
-
-    def write(buffer)
-      bytes = send_byte_buffer(buffer, 0)
-      buffer.position(buffer.position + bytes)
-    end
-  end
-end
-
 module ZMachine
   class ZMQChannel < Channel
 

data/zmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.4.1"
+  spec.version       = "0.4.2"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.description   = %q{pure JRuby multi-threaded mostly EventMachine compatible event loop}
@@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "liquid-ext"
+  spec.add_dependency "liquid-ext", ">= 3.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zmachine
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid-ext
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.8
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.8
   prerelease: false
   type: :runtime
 description: pure JRuby multi-threaded mostly EventMachine compatible event loop