dcell 0.7.1 → 0.8.0

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+#  - rbx crashing :(
+  - jruby
+  - ruby-head
+
+env: "JRUBY_OPTS=--1.9"

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.8.0
+-----
+* Track calls in-flight with DCell::RPC and DCell::RPC::Manager
+* Compatibility changes for Celluloid 0.8.0
+
 0.7.1
 -----
 * Bump version to match Celluloid

data/Rakefile

@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 Dir["tasks/**/*.task"].each { |task| load task }
 
-task :default => :spec
+task :default => :spec

data/celluloid-zmq/CHANGES.md

@@ -1,3 +1,7 @@
+0.8.0
+-----
+* Update to match internals of celluloid-io
+
 0.7.0
 -----
 * Use celluloid-io gem

data/celluloid-zmq/celluloid-zmq.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |gem|
   gem.name          = "celluloid-zmq"
   gem.version       = Celluloid::ZMQ::VERSION
 
-  gem.add_dependency "celluloid",    ">= 0.7.0"
-  gem.add_dependency "celluloid-io", ">= 0.7.0"
+  gem.add_dependency "celluloid",    "~> 0.8.0"
+  gem.add_dependency "celluloid-io", "~> 0.8.0"
   gem.add_dependency "ffi"
   gem.add_dependency "ffi-rzmq"
 

data/celluloid-zmq/lib/celluloid/zmq.rb

@@ -24,15 +24,10 @@ module Celluloid
       end
     end
 
-    # Wait for the given IO object to become readable
-    def wait_readable(socket)
-      # Law of demeter be damned!
-      current_actor.mailbox.reactor.wait_readable(socket)
-    end
+    extend Forwardable
 
-    # Wait for the given IO object to become writeable
-    def wait_writeable(socket)
-      current_actor.mailbox.reactor.wait_writeable(socket)
-    end
+    # Wait for the given IO object to become readable/writeable
+    def_delegators 'current_actor.mailbox.reactor',
+      :wait_readable, :wait_writeable
   end
 end

data/celluloid-zmq/lib/celluloid/zmq/mailbox.rb

@@ -6,8 +6,7 @@ module Celluloid
         # More APIs and less monkeypatching would be useful here
         @messages = []
         @lock    = Mutex.new
-        @waker   = Waker.new
-        @reactor = Reactor.new(@waker)
+        @reactor = Reactor.new
       end
     end
   end

data/celluloid-zmq/lib/celluloid/zmq/reactor.rb

@@ -3,8 +3,13 @@ module Celluloid
     # React to incoming 0MQ and Celluloid events. This is kinda sorta supposed
     # to resemble the Reactor design pattern.
     class Reactor
-      def initialize(waker)
-        @waker = waker
+      extend Forwardable
+
+      def_delegator :@waker, :signal, :wakeup
+      def_delegator :@waker, :cleanup, :shutdown
+
+      def initialize
+        @waker = Waker.new
         @poller = ::ZMQ::Poller.new
         @readers = {}
         @writers = {}
@@ -30,13 +35,12 @@ module Celluloid
         if set.has_key? socket
           raise ArgumentError, "another method is already waiting on #{socket.inspect}"
         else
-          set[socket] = Fiber.current
+          set[socket] = Task.current
         end
 
         @poller.register socket, type
-        Fiber.yield
 
-        @poller.deregister socket, type
+        Task.suspend :zmqwait
         socket
       end
 
@@ -57,16 +61,28 @@ module Celluloid
 
         @poller.readables.each do |sock|
           if sock == @waker.socket
-            yield
+            @waker.wait
           else
-            fiber = @readers.delete sock
-            fiber.resume if fiber
+            task = @readers.delete sock
+            @poller.deregister sock, ::ZMQ::POLLIN
+
+            if task
+              task.resume
+            else
+              Celluloid::Logger.debug "ZMQ error: got read event without associated reader"
+            end
           end
         end
 
         @poller.writables.each do |sock|
-          fiber = @writers.delete sock
-          fiber.resume if fiber
+          task = @writers.delete sock
+          @poller.deregister sock, ::ZMQ::POLLOUT
+
+          if task
+            task.resume
+          else
+            Celluloid::Logger.debug "ZMQ error: got write event without associated reader"
+          end
         end
       end
     end

data/celluloid-zmq/lib/celluloid/zmq/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module ZMQ
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

data/celluloid-zmq/lib/celluloid/zmq/waker.rb

@@ -1,6 +1,7 @@
 module Celluloid
   module ZMQ
-    class DeadWakerError < Celluloid::IO::DeadWakerError; end # You can't wake the dead
+    # You can't wake the dead
+    DeadWakerError = Class.new IOError
 
     # Wakes up sleepy threads so that they can check their mailbox
     # Works like a ConditionVariable, except it's implemented as a ZMQ socket

data/dcell.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "celluloid", ">= 0.7.0"
-  gem.add_dependency "celluloid-zmq", ">= 0.7.0"
+  gem.add_dependency "celluloid", "~> 0.8.0"
+  gem.add_dependency "celluloid-zmq", "~> 0.8.0"
   gem.add_dependency "redis"
   gem.add_dependency "redis-namespace"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", ">= 2.7.0"
+  gem.add_development_dependency "rspec", "~> 2.7.0"
   #gem.add_development_dependency "zk"
 end

data/lib/dcell.rb

@@ -10,16 +10,17 @@ require 'dcell/node'
 require 'dcell/global'
 require 'dcell/responses'
 require 'dcell/router'
+require 'dcell/rpc'
 require 'dcell/server'
 
 require 'dcell/registries/redis_adapter'
-require 'dcell/application'
 require 'dcell/celluloid_ext'
 
 # Distributed Celluloid
 module DCell
   DEFAULT_PORT  = 7777 # Default DCell port
   ZMQ_POOL_SIZE = 1 # DCell uses a fixed-size 0MQ thread pool
+
   @zmq_context  = Celluloid::ZMQ.context = ::ZMQ::Context.new(ZMQ_POOL_SIZE)
   @config_lock  = Mutex.new
 
@@ -78,12 +79,12 @@ module DCell
 
     # Run the DCell application
     def run
-      DCell::Application.run
+      DCell::Group.run
     end
 
     # Run the DCell application in the background
     def run!
-      DCell::Application.run!
+      DCell::Group.run!
     end
 
     # Start combines setup and run! into a single step
@@ -92,4 +93,9 @@ module DCell
       run!
     end
   end
+
+  # DCell's actor dependencies
+  class Group < Celluloid::Group
+    supervise Server, :as => :dcell_server
+  end
 end

data/lib/dcell/celluloid_ext.rb

@@ -54,4 +54,16 @@ module Celluloid
       DCell::MailboxProxy._load(string)
     end
   end
+
+  class SyncCall
+    def _dump(level)
+      rpc_id = DCell::RPC::Manager.register self
+      payload = Marshal.dump([@caller,@method,@arguments,@block])
+      "#{rpc_id.to_s(16)}@#{DCell.id}:#{payload}"
+    end
+
+    def self._load(string)
+      DCell::RPC._load(string)
+    end
+  end
 end

data/lib/dcell/node.rb

@@ -1,6 +1,7 @@
 module DCell
   # A node in a DCell cluster
   class Node
+    include Celluloid
     include Celluloid::FSM
     attr_reader :id, :addr
 
@@ -69,6 +70,9 @@ module DCell
       @id, @addr = id, addr
       @socket = nil
       @heartbeat = nil
+
+      # Total hax to accommodate the new Celluloid::FSM API
+      attach self
     end
 
     def finalize

data/lib/dcell/registries/redis_adapter.rb

@@ -59,7 +59,7 @@ module DCell
 
         def get(key)
           string = @redis.hget 'globals', key.to_s
-          Marshal.load string
+          Marshal.load string if string
         end
 
         # Set a global value

data/lib/dcell/rpc.rb

@@ -0,0 +1,66 @@
+require 'weakref'
+
+module DCell
+  EPOCH = Time.new(2012, 1, 1, 0, 0, 0, "+00:00") # All things begin in 2012
+
+  class RPC < Celluloid::SyncCall
+    def initialize(id, caller, method, arguments, block)
+      @id, @caller, @method, @arguments, @block = id, caller, method, arguments, block
+    end
+
+    # Custom marshaller for compatibility with Celluloid::Mailbox marshalling
+    def _dump(level)
+      payload = Marshal.dump [@caller, @method, @arguments, @block]
+      "#{@id}:#{payload}"
+    end
+
+    # Loader for custom marshal format
+    def self._load(string)
+      id = string.slice!(0, string.index(":") + 1)
+      match = id.match(/^([0-9a-fA-F]+)@(.+?):$/)
+      raise ArgumentError, "couldn't parse call ID" unless match
+
+      call_id, node_id = match[1], match[2]
+
+      if DCell.id == node_id
+        Manager.claim Integer("0x#{call_id}")
+      else
+        caller, method, arguments, block = Marshal.load(string)
+        RPC.new("#{call_id}@#{node_id}", caller, method, arguments, block)
+      end
+    end
+
+    # Tracks calls-in-flight
+    class Manager
+      @mutex  = Mutex.new
+      @ids    = {}
+      @calls  = {}
+      @serial = Integer(Time.now - EPOCH) * 0x100000
+
+      def self.register(call)
+        @mutex.lock
+        call_id = @ids[call.object_id]
+        unless call_id
+          call_id = @serial
+          @serial += 1
+          @ids[call.object_id] = call_id
+        end
+
+        @calls[call_id] = WeakRef.new(call)
+        call_id
+      ensure
+        @mutex.unlock
+      end
+
+      def self.claim(call_id)
+        @mutex.lock
+        ref = @calls.delete(call_id)
+        ref.__getobj__ if ref
+      rescue WeakRef::RefError
+        # Nothing to see here, folks
+      ensure
+        @mutex.unlock
+      end
+    end
+  end
+end

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/spec/dcell/global_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe DCell::Global do
+  it "can handle unexisting keys" do
+    expect { DCell::Global[:unexisting] }.to_not raise_exception
+  end
+
   it "stores values" do
     DCell::Global[:the_answer] = 42
     DCell::Global[:the_answer].should == 42

data/spec/test_node.rb

@@ -25,9 +25,9 @@ class TestActor
   end
 end
 
-class TestApplication < Celluloid::Application
-  supervise DCell::Application
+class TestGroup < Celluloid::Group
+  supervise DCell::Group
   supervise TestActor, :as => :test_actor
 end
 
-TestApplication.run
+TestGroup.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcell
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70286435226960 !ruby/object:Gem::Requirement
+  requirement: &70247796045460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286435226960
+  version_requirements: *70247796045460
 - !ruby/object:Gem::Dependency
   name: celluloid-zmq
-  requirement: &70286435226380 !ruby/object:Gem::Requirement
+  requirement: &70247796044740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286435226380
+  version_requirements: *70247796044740
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70286435225840 !ruby/object:Gem::Requirement
+  requirement: &70247796043700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286435225840
+  version_requirements: *70247796043700
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70286435225200 !ruby/object:Gem::Requirement
+  requirement: &70247796043240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286435225200
+  version_requirements: *70247796043240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70286435224680 !ruby/object:Gem::Requirement
+  requirement: &70247796042780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286435224680
+  version_requirements: *70247796042780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70286435223880 !ruby/object:Gem::Requirement
+  requirement: &70247796042200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70286435223880
+  version_requirements: *70247796042200
 description: DCell is an distributed object framework based on Celluloid built on
   0MQ and Zookeeper
 email:
@@ -87,6 +87,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -112,7 +113,6 @@ files:
 - dcell.gemspec
 - lib/dcell.rb
 - lib/dcell/actor_proxy.rb
-- lib/dcell/application.rb
 - lib/dcell/celluloid_ext.rb
 - lib/dcell/directory.rb
 - lib/dcell/global.rb
@@ -123,6 +123,7 @@ files:
 - lib/dcell/registries/zk_adapter.rb
 - lib/dcell/responses.rb
 - lib/dcell/router.rb
+- lib/dcell/rpc.rb
 - lib/dcell/rspec.rb
 - lib/dcell/server.rb
 - lib/dcell/version.rb

data/lib/dcell/application.rb

@@ -1,6 +0,0 @@
-module DCell
-  # Actors which run when DCell is active
-  class Application < Celluloid::Application
-    supervise Server, :as => :dcell_server
-  end
-end