celluloid 0.15.2 → 0.16.0.pre3

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

@@ -1,12 +1,13 @@
 require 'set'
+
 require 'timers'
 
 module Celluloid
   # Allow methods to directly interact with the actor protocol
   class Receivers
-    def initialize
+    def initialize(timers)
       @receivers = Set.new
-      @timers = Timers.new
+      @timers = timers
     end
 
     # Receive an asynchronous message
@@ -28,24 +29,15 @@ module Celluloid
       end
     end
 
-    # How long to wait until the next timer fires
-    def wait_interval
-      @timers.wait_interval
-    end
-
-    # Fire any pending timers
-    def fire_timers
-      @timers.fire
-    end
-
     # Handle incoming messages
     def handle_message(message)
       receiver = @receivers.find { |r| r.match(message) }
       return unless receiver
 
       @receivers.delete receiver
-      @timers.cancel receiver.timer if receiver.timer
+      receiver.timer.cancel 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

data/lib/celluloid/supervision_group.rb

@@ -5,6 +5,7 @@ module Celluloid
     trap_exit :restart_actor
 
     class << self
+
       # Actors or sub-applications to be supervised
       def blocks
         @blocks ||= []
@@ -55,10 +56,12 @@ module Celluloid
       end
     end
 
+    finalizer :finalize
+
     # Start the group
     def initialize(registry = nil)
       @members = []
-      @registry = registry || Registry.root
+      @registry = registry || Celluloid.actor_system.registry
 
       yield current_actor if block_given?
     end
@@ -81,18 +84,15 @@ module Celluloid
     def add(klass, options)
       member = Member.new(@registry, klass, options)
       @members << member
-      member
+      member.actor
     end
 
     def actors
       @members.map(&:actor)
     end
 
-    finalizer :finalize
-
-    # Terminate the group
-    def finalize
-      @members.reverse_each(&:terminate)
+    def [](actor_name)
+      @registry[actor_name]
     end
 
     # Restart a crashed actor
@@ -102,7 +102,12 @@ module Celluloid
       end
       raise "a group member went missing. This shouldn't be!" unless member
 
-      member.restart(reason)
+      if reason
+        member.restart
+      else
+        member.cleanup
+        @members.delete(member)
+      end
     end
 
     # A member of the group
@@ -137,21 +142,28 @@ module Celluloid
         @registry[@name] = @actor if @name
       end
 
-      def restart(reason)
+      def restart
         @actor = nil
-        @registry.delete(@name) if @name
-
-        # Ignore supervisors that shut down cleanly
-        return unless reason
+        cleanup
 
         start
       end
 
       def terminate
-        @registry.delete(@name) if @name
+        cleanup
         @actor.terminate if @actor
       rescue DeadActorError
       end
+
+      def cleanup
+        @registry.delete(@name) if @name
+      end
+    end
+
+    private
+
+    def finalize
+      @members.reverse_each(&:terminate) if @members
     end
   end
 end

data/lib/celluloid/tasks/task_fiber.rb

@@ -6,10 +6,12 @@ module Celluloid
 
     def create
       queue = Thread.current[:celluloid_queue]
+      actor_system = Thread.current[:celluloid_actor_system]
       @fiber = Fiber.new do
         # FIXME: cannot use the writer as specs run inside normal Threads
         Thread.current[:celluloid_role] = :actor
         Thread.current[:celluloid_queue] = queue
+        Thread.current[:celluloid_actor_system] = actor_system
         yield
       end
     end
@@ -33,5 +35,9 @@ module Celluloid
     rescue FiberError
       # If we're getting this the task should already be dead
     end
+
+    def backtrace
+      ["#{self.class} backtrace unavailable. Please try `Celluloid.task_class = Celluloid::TaskThread` if you need backtraces here."]
+    end
   end
 end

data/lib/celluloid/tasks/task_thread.rb

@@ -12,7 +12,8 @@ module Celluloid
     end
 
     def create
-      @thread = Celluloid::ThreadHandle.new(:task) do
+      # TODO: move this to ActorSystem#get_thread (ThreadHandle inside InternalPool)
+      @thread = ThreadHandle.new(Thread.current[:celluloid_actor_system], :task) do
         begin
           ex = @resume_queue.pop
           raise ex if ex.is_a?(Task::TerminatedError)

data/lib/celluloid/tasks.rb

@@ -48,6 +48,8 @@ module Celluloid
           @status = :running
           actor.setup_thread
 
+          name_current_thread thread_metadata
+
           Thread.current[:celluloid_task] = self
           CallChain.current_id = @chain_id
 
@@ -56,6 +58,7 @@ module Celluloid
         rescue Task::TerminatedError
           # Task was explicitly terminated
         ensure
+          name_current_thread nil
           @status = :dead
           actor.tasks.delete self
         end
@@ -74,14 +77,9 @@ module Celluloid
       @status = status
 
       if $CELLULOID_DEBUG && @dangerous_suspend
-        warning = "Dangerously suspending task: "
-        warning << [
-          "type=#{@type.inspect}",
-          "meta=#{@meta.inspect}",
-          "status=#{@status.inspect}"
-        ].join(", ")
-
-        Logger.warn [warning, *caller[2..8]].join("\n\t")
+        Logger.with_backtrace(caller[2...8]) do |logger|
+          logger.warn "Dangerously suspending task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}"
+        end
       end
 
       value = signal
@@ -118,7 +116,9 @@ module Celluloid
       raise "Cannot terminate an exclusive task" if exclusive?
 
       if running?
-        Celluloid.logger.warn "Terminating task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}"
+        Logger.with_backtrace(backtrace) do |logger|
+          logger.warn "Terminating task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}"
+        end
         exception = Task::TerminatedError.new("task was terminated")
         exception.set_backtrace(caller)
         resume exception
@@ -150,6 +150,25 @@ module Celluloid
         raise message if $CELLULOID_DEBUG
       end
     end
+
+    private
+
+    def name_current_thread(new_name)
+      return unless RUBY_PLATFORM == "java"
+      if new_name.nil?
+        new_name = Thread.current[:celluloid_original_thread_name]
+        Thread.current[:celluloid_original_thread_name] = nil
+      else
+        Thread.current[:celluloid_original_thread_name] = Thread.current.to_java.getNativeThread.get_name
+      end
+      Thread.current.to_java.getNativeThread.set_name(new_name)
+    end
+
+    def thread_metadata
+      method = @meta && @meta[:method_name] || "<no method>"
+      klass = Thread.current[:celluloid_actor] && Thread.current[:celluloid_actor].behavior.subject.bare_object.class || "<no actor>"
+      format("[Celluloid] %s#%s", klass, method)
+    end
   end
 end
 

data/lib/celluloid/thread_handle.rb

@@ -3,11 +3,11 @@ module Celluloid
   # accidentally do things to threads which have been returned to the pool,
   # such as, say, killing them
   class ThreadHandle
-    def initialize(role = nil)
+    def initialize(actor_system, role = nil)
       @mutex = Mutex.new
       @join  = ConditionVariable.new
 
-      @thread = Celluloid.internal_pool.get do
+      @thread = actor_system.get_thread do
         Thread.current.role = role
         begin
           yield