celluloid 0.15.2 → 0.16.0.pre

data/lib/celluloid/logger.rb

@@ -1,8 +1,38 @@
 module Celluloid
   module Logger
+    class WithBacktrace
+      def initialize(backtrace)
+        @backtrace = backtrace
+      end
+
+      def debug(string)
+        Celluloid.logger.debug(decorate(string))
+      end
+
+      def info(string)
+        Celluloid.logger.info(decorate(string))
+      end
+
+      def warn(string)
+        Celluloid.logger.warn(decorate(string))
+      end
+
+      def error(string)
+        Celluloid.logger.error(decorate(string))
+      end
+
+      def decorate(string)
+        [string, @backtrace].join("\n\t")
+      end
+    end
+
     @exception_handlers = []
     module_function
 
+    def with_backtrace(backtrace)
+      yield WithBacktrace.new(backtrace) if Celluloid.logger
+    end
+
     # Send a debug message
     def debug(string)
       Celluloid.logger.debug(string) if Celluloid.logger

data/lib/celluloid/logging/incident_logger.rb

@@ -111,7 +111,7 @@ module Celluloid
       end
       messages.sort
     end
-    
+
     def clear
       @buffer_mutex.synchronize do
         @buffers.each { |buffer| buffer.clear }

data/lib/celluloid/mailbox.rb

@@ -58,10 +58,11 @@ module Celluloid
 
           unless message
             if timeout
+              # TODO: use hitimes/timers instead of Time.now
               now = Time.now
               wait_until ||= now + timeout
               wait_interval = wait_until - now
-              return if wait_interval <= 0
+              raise(TimeoutError, "mailbox timeout exceeded", nil) if wait_interval <= 0
             else
               wait_interval = nil
             end
@@ -76,23 +77,6 @@ module Celluloid
       end
     end
 
-    # Retrieve the next message in the mailbox
-    def next_message
-      message = nil
-
-      if block_given?
-        index = @messages.index do |msg|
-          yield(msg) || msg.is_a?(SystemEvent)
-        end
-
-        message = @messages.slice!(index, 1).first if index
-      else
-        message = @messages.shift
-      end
-
-      message
-    end
-
     # Shut down this mailbox and clean up its contents
     def shutdown
       raise MailboxDead, "mailbox already shutdown" if @dead
@@ -141,6 +125,23 @@ module Celluloid
 
     private
 
+    # Retrieve the next message in the mailbox
+    def next_message
+      message = nil
+
+      if block_given?
+        index = @messages.index do |msg|
+          yield(msg) || msg.is_a?(SystemEvent)
+        end
+
+        message = @messages.slice!(index, 1).first if index
+      else
+        message = @messages.shift
+      end
+
+      message
+    end
+
     def dead_letter(message)
       Logger.debug "Discarded message (mailbox is dead): #{message}" if $CELLULOID_DEBUG
     end

data/lib/celluloid/method.rb

@@ -13,6 +13,14 @@ module Celluloid
       @proxy.method_missing(:method, @name).arity
     end
 
+    def name
+      @proxy.method_missing(:method, @name).name
+    end
+
+    def parameters
+      @proxy.method_missing(:method, @name).parameters
+    end
+
     def call(*args, &block)
       @proxy.__send__(@name, *args, &block)
     end

data/lib/celluloid/pool_manager.rb

@@ -10,7 +10,7 @@ module Celluloid
     finalizer :__shutdown__
 
     def initialize(worker_class, options = {})
-      @size = options[:size] || [Celluloid.cores, 2].max
+      @size = options[:size] || [Celluloid.cores || 2, 2].max
       raise ArgumentError, "minimum pool size is 2" if @size < 2
 
       @worker_class = worker_class

data/lib/celluloid/probe.rb

@@ -0,0 +1,73 @@
+require 'celluloid'
+
+$CELLULOID_MONITORING = true
+
+module Celluloid
+  class Probe
+    include Celluloid
+    include Celluloid::Notifications
+
+    NOTIFICATIONS_TOPIC_BASE = 'celluloid.events.%s'
+    INITIAL_EVENTS = Queue.new
+
+    class << self
+      def run
+        # spawn the actor if not found
+        supervise_as(:probe_actor) unless Actor[:probe_actor] && Actor[:probe_actor].alive?
+      end
+
+      def actor_created(actor)
+        trigger_event(:actor_created, actor)
+      end
+
+      def actor_named(actor)
+        trigger_event(:actor_named, actor)
+      end
+
+      def actor_died(actor)
+        trigger_event(:actor_died, actor)
+      end
+
+      def actors_linked(a, b)
+        a = find_actor(a)
+        b = find_actor(b)
+        trigger_event(:actors_linked, a, b)
+      end
+
+      private
+
+      def trigger_event(name, *args)
+        return unless $CELLULOID_MONITORING
+        probe_actor = Actor[:probe_actor]
+        if probe_actor
+          probe_actor.async.dispatch_event(name, args)
+        else
+          INITIAL_EVENTS << [name, args]
+        end
+      end
+
+      def find_actor(obj)
+        if obj.__send__(:class) == Actor
+          obj
+        elsif owner = obj.instance_variable_get(OWNER_IVAR)
+          owner
+        end
+      end
+    end
+
+    def initialize
+      async.first_run
+    end
+
+    def first_run
+      until INITIAL_EVENTS.size == 0
+        event = INITIAL_EVENTS.pop
+        dispatch_event(*event)
+      end
+    end
+
+    def dispatch_event(cmd, args)
+      publish(NOTIFICATIONS_TOPIC_BASE % cmd, args)
+    end
+  end
+end

data/lib/celluloid/properties.rb

@@ -9,7 +9,7 @@ module Celluloid
 
       ancestors.first.send(:define_singleton_method, name) do |value = nil, *extra|
         if value
-          value = value ? [value, *extra] : [] if multi
+          value = value ? [value, *send(name), *extra].uniq : [] if multi
           instance_variable_set(ivar_name, value)
         elsif instance_variables.include?(ivar_name)
           instance_variable_get(ivar_name)
@@ -21,4 +21,4 @@ module Celluloid
       end
     end
   end
-end
+end

data/lib/celluloid/proxies/actor_proxy.rb

@@ -1,59 +1,27 @@
 module Celluloid
-  # A proxy object returned from Celluloid::Actor.new/new_link which converts
-  # the normal Ruby method protocol into an inter-actor message protocol
-  class ActorProxy < SyncProxy
-    attr_reader :thread
+  # A proxy which controls the Actor lifecycle
+  class ActorProxy < AbstractProxy
+    attr_reader :thread, :mailbox
 
     # Used for reflecting on proxy objects themselves
     def __class__; ActorProxy; end
 
-    def initialize(actor)
-      @thread = actor.thread
-
-      super(actor.mailbox, actor.subject.class.to_s)
-      @sync_proxy   = SyncProxy.new(@mailbox, @klass)
-      @async_proxy  = AsyncProxy.new(@mailbox, @klass)
-      @future_proxy = FutureProxy.new(@mailbox, @klass)
-    end
-
-    def _send_(meth, *args, &block)
-      method_missing :__send__, meth, *args, &block
+    def initialize(thread, mailbox)
+      @thread = thread
+      @mailbox = mailbox
     end
 
     def inspect
-      method_missing :inspect
+      # TODO: use a system event to fetch actor state: tasks?
+      "#<Celluloid::ActorProxy(#{@mailbox.address}) alive>"
     rescue DeadActorError
-      "#<Celluloid::ActorProxy(#{@klass}) dead>"
-    end
-
-    def method(name)
-      Method.new(self, name)
+      "#<Celluloid::ActorProxy(#{@mailbox.address}) dead>"
     end
 
     def alive?
       @mailbox.alive?
     end
 
-    alias_method :sync, :method_missing
-
-    # Obtain an async proxy or explicitly invoke a named async method
-    def async(method_name = nil, *args, &block)
-      if method_name
-        @async_proxy.method_missing method_name, *args, &block
-      else
-        @async_proxy
-      end
-    end
-
-    # Obtain a future proxy or explicitly invoke a named future method
-    def future(method_name = nil, *args, &block)
-      if method_name
-        @future_proxy.method_missing method_name, *args, &block
-      else
-        @future_proxy
-      end
-    end
-
     # Terminate the associated actor
     def terminate
       terminate!

data/lib/celluloid/proxies/cell_proxy.rb

@@ -0,0 +1,68 @@
+module Celluloid
+  # A proxy object returned from Celluloid::Actor.new/new_link which converts
+  # the normal Ruby method protocol into an inter-actor message protocol
+  class CellProxy < SyncProxy
+    # Used for reflecting on proxy objects themselves
+    def __class__; CellProxy; end
+
+    def initialize(actor_proxy, mailbox, klass)
+      super(mailbox, klass)
+      @actor_proxy  = actor_proxy
+      @sync_proxy   = SyncProxy.new(mailbox, klass)
+      @async_proxy  = AsyncProxy.new(mailbox, klass)
+      @future_proxy = FutureProxy.new(mailbox, klass)
+    end
+
+    def _send_(meth, *args, &block)
+      method_missing :__send__, meth, *args, &block
+    end
+
+    def inspect
+      method_missing :inspect
+    rescue DeadActorError
+      "#<Celluloid::CellProxy(#{@klass}) dead>"
+    end
+
+    def method(name)
+      Method.new(self, name)
+    end
+
+    alias_method :sync, :method_missing
+
+    # Obtain an async proxy or explicitly invoke a named async method
+    def async(method_name = nil, *args, &block)
+      if method_name
+        @async_proxy.method_missing method_name, *args, &block
+      else
+        @async_proxy
+      end
+    end
+
+    # Obtain a future proxy or explicitly invoke a named future method
+    def future(method_name = nil, *args, &block)
+      if method_name
+        @future_proxy.method_missing method_name, *args, &block
+      else
+        @future_proxy
+      end
+    end
+
+    def alive?
+      @actor_proxy.alive?
+    end
+
+    def thread
+      @actor_proxy.thread
+    end
+
+    # Terminate the associated actor
+    def terminate
+      @actor_proxy.terminate
+    end
+
+    # Terminate the associated actor asynchronously
+    def terminate!
+      @actor_proxy.terminate!
+    end
+  end
+end

data/lib/celluloid/proxies/sync_proxy.rb

@@ -15,7 +15,7 @@ module Celluloid
     end
 
     def respond_to?(meth, include_private = false)
-      __class__.instance_methods.include?(meth) || super
+      __class__.instance_methods.include?(meth) || method_missing(:respond_to?, meth, include_private)
     end
 
     def method_missing(meth, *args, &block)

data/lib/celluloid/receivers.rb

@@ -46,6 +46,7 @@ module Celluloid
       @receivers.delete receiver
       @timers.cancel receiver.timer if receiver.timer
       receiver.resume message
+      message
     end
   end
 

data/lib/celluloid/registry.rb

@@ -3,10 +3,6 @@ require 'thread'
 module Celluloid
   # The Registry allows us to refer to specific actors by human-meaningful names
   class Registry
-    class << self
-      attr_reader :root
-    end
-
     def initialize
       @registry = {}
       @registry_lock = Mutex.new
@@ -15,7 +11,7 @@ module Celluloid
     # Register an Actor
     def []=(name, actor)
       actor_singleton = class << actor; self; end
-      unless actor_singleton.ancestors.include? ActorProxy
+      unless actor_singleton.ancestors.include? AbstractProxy
         raise TypeError, "not an actor"
       end
 
@@ -57,8 +53,5 @@ module Celluloid
       end
       hash
     end
-
-    # Create the default registry
-    @root = new
   end
 end

data/lib/celluloid/stack_dump.rb

@@ -16,17 +16,21 @@ module Celluloid
 
     class ActorState
       include DisplayBacktrace
-
-      attr_accessor :subject_id, :subject_class, :name
+      attr_accessor :name, :id, :cell
       attr_accessor :status, :tasks
       attr_accessor :backtrace
 
       def dump
         string = ""
-        string << "Celluloid::Actor 0x#{subject_id.to_s(16)}: #{subject_class}"
+        string << "Celluloid::Actor 0x#{id.to_s(16)}"
         string << " [#{name}]" if name
         string << "\n"
 
+        if cell
+          string << cell.dump
+          string << "\n"
+        end
+
         if status == :idle
           string << "State: Idle (waiting for messages)\n"
           display_backtrace backtrace, string
@@ -46,12 +50,18 @@ module Celluloid
       end
     end
 
-    class ThreadState < Struct.new(:thread_id, :backtrace)
+    class CellState < Struct.new(:subject_id, :subject_class)
+      def dump
+        "Celluloid::Cell 0x#{subject_id.to_s(16)}: #{subject_class}"
+      end
+    end
+
+    class ThreadState < Struct.new(:thread_id, :backtrace, :role)
       include DisplayBacktrace
 
       def dump
         string = ""
-        string << "Thread 0x#{thread_id.to_s(16)}:\n"
+        string << "Thread 0x#{thread_id.to_s(16)} (#{role}):\n"
         display_backtrace backtrace, string
         string
       end
@@ -59,7 +69,9 @@ module Celluloid
 
     attr_accessor :actors, :threads
 
-    def initialize
+    def initialize(internal_pool)
+      @internal_pool = internal_pool
+
       @actors  = []
       @threads = []
 
@@ -67,7 +79,7 @@ module Celluloid
     end
 
     def snapshot
-      Celluloid.internal_pool.each do |thread|
+      @internal_pool.each do |thread|
         if thread.role == :actor
           @actors << snapshot_actor(thread.actor) if thread.actor
         else
@@ -78,8 +90,12 @@ module Celluloid
 
     def snapshot_actor(actor)
       state = ActorState.new
-      state.subject_id = actor.subject.object_id
-      state.subject_class = actor.subject.class
+      state.id = actor.object_id
+
+      # TODO: delegate to the behavior
+      if actor.behavior.is_a?(Cell)
+        state.cell = snapshot_cell(actor.behavior)
+      end
 
       tasks = actor.tasks
       if tasks.empty?
@@ -93,11 +109,18 @@ module Celluloid
       state
     end
 
+    def snapshot_cell(behavior)
+      state = CellState.new
+      state.subject_id = behavior.subject.object_id
+      state.subject_class = behavior.subject.class
+      state
+    end
+
     def snapshot_thread(thread)
-      ThreadState.new(thread.object_id, thread.backtrace)
+      ThreadState.new(thread.object_id, thread.backtrace, thread.role)
     end
 
-    def dump(output = STDERR)
+    def print(output = STDERR)
       @actors.each do |actor|
         output.print actor.dump
       end