Factor join and kill into class methods of Actor

lib/celluloid/actor.rb

@@ -139,6 +139,21 @@ def monitoring?(actor)
       def linked_to?(actor)
         monitoring?(actor) && Thread.current[:actor].links.include?(actor)
       end
+
+      # Forcibly kill a given actor
+      def kill(actor)
+        actor.thread.kill
+        begin
+          actor.mailbox.shutdown
+        rescue DeadActorError
+        end
+      end
+
+      # Wait for an actor to terminate
+      def join(actor)
+        actor.thread.join
+        actor
+      end
     end
 
     # Wrap the given subject with an Actor

lib/celluloid/actor_proxy.rb

@@ -3,7 +3,7 @@ module Celluloid
   # dispatches calls and casts to normal Ruby objects which are running inside
   # of their own threads.
   class ActorProxy
-    attr_reader :mailbox
+    attr_reader :mailbox, :thread
 
     def initialize(actor)
       @mailbox, @thread, @klass = actor.mailbox, actor.thread, actor.subject.class.to_s
@@ -65,7 +65,7 @@ def future(method_name, *args, &block)
     # Terminate the associated actor
     def terminate
       terminate!
-      join
+      Actor.join(self)
       nil
     end
 
@@ -77,16 +77,12 @@ def terminate!
 
     # Forcibly kill a given actor
     def kill
-      @thread.kill
-      begin
-        @mailbox.shutdown
-      rescue DeadActorError
-      end
+      Actor.kill(self)
     end
 
     # Wait for an actor to terminate
     def join
-      @thread.join
+      Actor.join(self)
     end
 
     # method_missing black magic to call bang predicate methods asynchronously

lib/celluloid/thread_handle.rb

@@ -27,12 +27,13 @@ def alive?
     # Forcibly kill the thread
     def kill
       !!@mutex.synchronize { @thread.kill if @thread }
+      self
     end
 
     # Join to a running thread, blocking until it terminates
     def join
       @mutex.synchronize { @join.wait(@mutex) if @thread }
-      nil
+      self
     end
   end
 end