celluloid 0.13.0 → 0.14.0.pre

data/lib/celluloid/proxies/async_proxy.rb

@@ -3,20 +3,32 @@ module Celluloid
   class AsyncProxy < AbstractProxy
     attr_reader :mailbox
 
-    def initialize(actor)
-      @mailbox, @klass = actor.mailbox, actor.subject.class.to_s
+    def initialize(mailbox, klass)
+      @mailbox, @klass = mailbox, klass
     end
 
     def inspect
       "#<Celluloid::AsyncProxy(#{@klass})>"
     end
 
-    # method_missing black magic to call bang predicate methods asynchronously
     def method_missing(meth, *args, &block)
       if @mailbox == ::Thread.current[:celluloid_mailbox]
-        Actor.async @mailbox, :__send__, meth, *args, &block
-      else
-        Actor.async @mailbox, meth, *args, &block
+        args.unshift meth
+        meth = :__send__
+      end
+
+      if block_given?
+        # FIXME: nicer exception
+        raise "Cannot use blocks with async yet"
+      end
+
+      begin
+        @mailbox << AsyncCall.new(meth, args, block)
+      rescue MailboxError
+        # Silently swallow asynchronous calls to dead actors. There's no way
+        # to reliably generate DeadActorErrors for async calls, so users of
+        # async calls should find other ways to deal with actors dying
+        # during an async call (i.e. linking/supervisors)
       end
     end
   end

data/lib/celluloid/proxies/block_proxy.rb

@@ -0,0 +1,29 @@
+module Celluloid
+  class BlockProxy
+    def initialize(call, mailbox, block)
+      @call = call
+      @mailbox = mailbox
+      @block = block
+      @execution = :sender
+    end
+    attr_writer :execution
+    attr_reader :call, :block
+
+    def to_proc
+      if @execution == :sender
+        lambda do |*values|
+          if task = Thread.current[:celluloid_task]
+            @mailbox << BlockCall.new(self, Actor.current.mailbox, values)
+            # TODO: if respond fails, the Task will never be resumed
+            task.suspend(:invokeblock)
+          else
+            # FIXME: better exception
+            raise "No task to suspend"
+          end
+        end
+      else
+        @block
+      end
+    end
+  end
+end

data/lib/celluloid/proxies/future_proxy.rb

@@ -3,8 +3,8 @@ module Celluloid
   class FutureProxy < AbstractProxy
     attr_reader :mailbox
 
-    def initialize(actor)
-      @mailbox, @klass = actor.mailbox, actor.subject.class.to_s
+    def initialize(mailbox, klass)
+      @mailbox, @klass = mailbox, klass
     end
 
     def inspect
@@ -13,7 +13,13 @@ module Celluloid
 
     # method_missing black magic to call bang predicate methods asynchronously
     def method_missing(meth, *args, &block)
-      Actor.future @mailbox, meth, *args, &block
+      if block_given?
+        # FIXME: nicer exception
+        raise "Cannot use blocks with futures yet"
+      end
+      future = Future.new
+      future.execute(@mailbox, meth, args, block)
+      future
     end
   end
 end

data/lib/celluloid/proxies/sync_proxy.rb

@@ -0,0 +1,31 @@
+module Celluloid
+  # A proxy which sends synchronous calls to an actor
+  class SyncProxy < AbstractProxy
+    attr_reader :mailbox
+
+    def initialize(mailbox, klass)
+      @mailbox, @klass = mailbox, klass
+    end
+
+    def inspect
+      "#<Celluloid::SyncProxy(#{@klass})>"
+    end
+
+    def method_missing(meth, *args, &block)
+      if @mailbox == ::Thread.current[:celluloid_mailbox]
+        args.unshift meth
+        meth = :__send__
+      end
+
+      call = SyncCall.new(::Celluloid.mailbox, meth, args, block)
+
+      begin
+        @mailbox << call
+      rescue MailboxError
+        raise DeadActorError, "attempted to call a dead actor"
+      end
+
+      call.value
+    end
+  end
+end

data/lib/celluloid/receivers.rb

@@ -12,7 +12,7 @@ module Celluloid
     # Receive an asynchronous message
     def receive(timeout = nil, &block)
       if Celluloid.exclusive?
-        Thread.mailbox.receive(timeout, &block)
+        Celluloid.mailbox.receive(timeout, &block)
       else
         receiver = Receiver.new block
 

data/lib/celluloid/responses.rb

@@ -15,7 +15,7 @@ module Celluloid
   # Call completed successfully
   class SuccessResponse < Response; end
 
-  # Call was aborted due to caller error
+  # Call was aborted due to sender error
   class ErrorResponse < Response
     def value
       ex = super
@@ -29,4 +29,16 @@ module Celluloid
       raise ex
     end
   end
+
+  class BlockResponse
+    def initialize(call, result)
+      @call = call
+      @result = result
+    end
+
+    def dispatch
+      @call.task.resume(@result)
+    end
+  end
+
 end

data/lib/celluloid/stack_dump.rb

@@ -1,7 +1,7 @@
 module Celluloid
   class StackDump
 
-    class TaskState < Struct.new(:task_class, :status)
+    class TaskState < Struct.new(:task_class, :status, :backtrace)
     end
 
     class ActorState
@@ -24,8 +24,9 @@ module Celluloid
 
     def snapshot
       Thread.list.each do |thread|
-        if actor = thread[:celluloid_actor]
-          @actors << snapshot_actor(actor)
+        if thread.celluloid?
+          next if thread.task
+          @actors << snapshot_actor(thread.actor) if thread.actor
         else
           @threads << snapshot_thread(thread)
         end
@@ -42,7 +43,7 @@ module Celluloid
         state.status = :idle
       else
         state.status = :running
-        state.tasks = tasks.collect { |t| TaskState.new(t.class, t.status) }
+        state.tasks = tasks.collect { |t| TaskState.new(t.class, t.status, t.backtrace) }
       end
 
       state.backtrace = actor.thread.backtrace if actor.thread
@@ -62,16 +63,18 @@ module Celluloid
 
         if actor.status == :idle
           string << "State: Idle (waiting for messages)\n"
+          display_backtrace actor.backtrace, string
         else
           string << "State: Running (executing tasks)\n"
+          display_backtrace actor.backtrace, string
           string << "Tasks:\n"
 
           actor.tasks.each_with_index do |task, i|
             string << "  #{i+1}) #{task.task_class}: #{task.status}\n"
+            display_backtrace task.backtrace, string
           end
         end
 
-        display_backtrace actor.backtrace, string
         output.print string
       end
 

data/lib/celluloid/supervision_group.rb

@@ -12,9 +12,9 @@ module Celluloid
 
       # Start this application (and watch it with a supervisor)
       def run!
-        group = new do |group|
+        group = new do |_group|
           blocks.each do |block|
-            block.call(group)
+            block.call(_group)
           end
         end
         group
@@ -63,6 +63,8 @@ module Celluloid
       yield current_actor if block_given?
     end
 
+    execute_block_on_receiver :initialize, :supervise, :supervise_as
+
     def supervise(klass, *args, &block)
       add(klass, :args => args, :block => block)
     end
@@ -95,8 +97,8 @@ module Celluloid
 
     # Restart a crashed actor
     def restart_actor(actor, reason)
-      member = @members.find do |member|
-        member.actor == actor
+      member = @members.find do |_member|
+        _member.actor == actor
       end
       raise "a group member went missing. This shouldn't be!" unless member
 

data/lib/celluloid/tasks.rb

@@ -19,10 +19,71 @@ module Celluloid
       Task.current.suspend(status)
     end
 
+    attr_reader :type, :status
+
     # Create a new task
     def initialize(type)
       @type   = type
       @status = :new
+
+      actor    = Thread.current[:celluloid_actor]
+      chain_id = Thread.current[:celluloid_chain_id]
+
+      raise NotActorError, "can't create tasks outside of actors" unless actor
+
+      create do
+        begin
+          @status = :running
+          actor.setup_thread
+          Thread.current[:celluloid_task]     = self
+          Thread.current[:celluloid_chain_id] = chain_id
+
+          actor.tasks << self
+          yield
+        rescue Task::TerminatedError
+          # Task was explicitly terminated
+        ensure
+          @status = :dead
+          actor.tasks.delete self
+        end
+      end
+    end
+
+    def create(&block)
+      raise "Implement #{self.class}#create"
+    end
+
+    # Suspend the current task, changing the status to the given argument
+    def suspend(status)
+      @status = status
+      value = signal
+
+      raise value if value.is_a?(Task::TerminatedError)
+      @status = :running
+
+      value
+    end
+
+    # Resume a suspended task, giving it a value to return if needed
+    def resume(value = nil)
+      deliver(value)
+      nil
+    end
+
+    # Terminate this task
+    def terminate
+      resume Task::TerminatedError.new("task was terminated") if running?
+    end
+
+    def backtrace
+    end
+
+    # Is the current task still running?
+    def running?; @status != :dead; end
+
+    # Nicer string inspect for tasks
+    def inspect
+      "#<#{self.class}:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
     end
   end
   
@@ -42,7 +103,7 @@ module Celluloid
     end
   
     def each(&blk)
-      @tasks.each &blk
+      @tasks.each(&blk)
     end
   
     def first
@@ -56,4 +117,4 @@ module Celluloid
 end
 
 require 'celluloid/tasks/task_fiber'
-require 'celluloid/tasks/task_thread'
+require 'celluloid/tasks/task_thread'

data/lib/celluloid/tasks/task_fiber.rb

@@ -3,52 +3,20 @@ module Celluloid
 
   # Tasks with a Fiber backend
   class TaskFiber < Task
-    attr_reader :type, :status
-
-    # Run the given block within a task
-    def initialize(type)
-      super
-
-      actor    = Thread.current[:celluloid_actor]
-      mailbox  = Thread.current[:celluloid_mailbox]
-      chain_id = Thread.current[:celluloid_chain_id]
-
-      raise NotActorError, "can't create tasks outside of actors" unless actor
 
+    def create
       @fiber = Fiber.new do
-        @status = :running
-        Thread.current[:celluloid_actor]    = actor
-        Thread.current[:celluloid_mailbox]  = mailbox
-        Thread.current[:celluloid_task]     = self
-        Thread.current[:celluloid_chain_id] = chain_id
-
-        actor.tasks << self
-
-        begin
-          yield
-        rescue Task::TerminatedError
-          # Task was explicitly terminated
-        ensure
-          @status = :dead
-          actor.tasks.delete self
-        end
+        yield
       end
     end
 
-    # Suspend the current task, changing the status to the given argument
-    def suspend(status)
-      @status = status
-      result = Fiber.yield
-      raise result if result.is_a?(Task::TerminatedError)
-      @status = :running
-
-      result
+    def signal
+      Fiber.yield
     end
 
     # Resume a suspended task, giving it a value to return if needed
-    def resume(value = nil)
+    def deliver(value)
       @fiber.resume value
-      nil
     rescue SystemStackError => ex
       raise FiberStackError, "#{ex} (please see https://github.com/celluloid/celluloid/wiki/Fiber-stack-errors)"
     rescue FiberError => ex
@@ -57,17 +25,9 @@ module Celluloid
 
     # Terminate this task
     def terminate
-      resume Task::TerminatedError.new("task was terminated") if @fiber.alive?
+      super
     rescue FiberError
       # If we're getting this the task should already be dead
     end
-
-    # Is the current task still running?
-    def running?; @fiber.alive?; end
-
-    # Nicer string inspect for tasks
-    def inspect
-      "<Celluloid::TaskFiber:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
-    end
   end
 end

data/lib/celluloid/tasks/task_thread.rb

@@ -1,62 +1,37 @@
 module Celluloid
   # Tasks with a Thread backend
   class TaskThread < Task
-    attr_reader :type, :status
-
     # Run the given block within a task
     def initialize(type)
-      super
-
       @resume_queue = Queue.new
       @exception_queue = Queue.new
       @yield_mutex  = Mutex.new
       @yield_cond   = ConditionVariable.new
 
-      actor    = Thread.current[:celluloid_actor]
-      mailbox  = Thread.current[:celluloid_mailbox]
-      chain_id = Thread.current[:celluloid_chain_id]
-
-      raise NotActorError, "can't create tasks outside of actors" unless actor
+      super
+    end
 
+    def create
       @thread = Celluloid.internal_pool.get do
         begin
           ex = @resume_queue.pop
           raise ex if ex.is_a?(Task::TerminatedError)
 
-          @status = :running
-          Thread.current[:celluloid_actor]    = actor
-          Thread.current[:celluloid_mailbox]  = mailbox
-          Thread.current[:celluloid_task]     = self
-          Thread.current[:celluloid_chain_id] = chain_id
-
-          actor.tasks << self
           yield
-        rescue Task::TerminatedError
-          # Task was explicitly terminated
         rescue Exception => ex
           @exception_queue << ex
         ensure
-          @status = :dead
-          actor.tasks.delete self
           @yield_cond.signal
         end
       end
     end
 
-    # Suspend the current task, changing the status to the given argument
-    def suspend(status)
-      @status = status
+    def signal
       @yield_cond.signal
-      value = @resume_queue.pop
-
-      raise value if value.is_a?(Task::TerminatedError)
-      @status = :running
-
-      value
+      @resume_queue.pop
     end
 
-    # Resume a suspended task, giving it a value to return if needed
-    def resume(value = nil)
+    def deliver(value)
       raise DeadTaskError, "cannot resume a dead task" unless @thread.alive?
 
       @yield_mutex.synchronize do
@@ -66,23 +41,12 @@ module Celluloid
           raise @exception_queue.pop
         end
       end
-
-      nil
     rescue ThreadError
       raise DeadTaskError, "cannot resume a dead task"
     end
 
-    # Terminate this task
-    def terminate
-      resume Task::TerminatedError.new("task was terminated") if @thread.alive?
-    end
-
-    # Is the current task still running?
-    def running?; @status != :dead; end
-
-    # Nicer string inspect for tasks
-    def inspect
-      "<Celluloid::TaskThread:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
+    def backtrace
+      @thread.backtrace
     end
   end
 end