celluloid 0.9.1 → 0.10.0

data/lib/celluloid.rb

@@ -25,11 +25,8 @@ module Celluloid
 
     # Obtain the currently running actor (if one exists)
     def current_actor
-      actor = Thread.current[:actor]
-      raise NotActorError, "not in actor scope" unless actor
-      actor.proxy
+      Actor.current
     end
-    alias_method :current, :current_actor
 
     # Receive an asynchronous message
     def receive(timeout = nil, &block)
@@ -111,7 +108,7 @@ module Celluloid
 
     # Create a new actor and link to the current one
     def new_link(*args, &block)
-      current_actor = Celluloid.current_actor
+      current_actor = Actor.current
       raise NotActorError, "can't link outside actor context" unless current_actor
 
       proxy = Actor.new(allocate).proxy
@@ -207,7 +204,7 @@ module Celluloid
 
   # Obtain the current_actor
   def current_actor
-    Celluloid.current_actor
+    Actor.current
   end
 
   # Obtain the running tasks for this actor
@@ -229,13 +226,13 @@ module Celluloid
 
   # Link this actor to another, allowing it to crash or react to errors
   def link(actor)
-    actor.notify_link current_actor
+    actor.notify_link Actor.current
     notify_link actor
   end
 
   # Remove links to another actor
   def unlink(actor)
-    actor.notify_unlink current_actor
+    actor.notify_unlink Actor.current
     notify_unlink actor
   end
 

data/lib/celluloid/actor.rb

@@ -23,6 +23,13 @@ module Celluloid
     attr_reader :proxy, :tasks, :links, :mailbox
 
     class << self
+      # Obtain the current actor
+      def current
+        actor = Thread.current[:actor]
+        raise NotActorError, "not in actor scope" unless actor
+        actor.proxy
+      end
+      
       # Invoke a method on the given actor via its mailbox
       def call(mailbox, meth, *args, &block)
         call = SyncCall.new(Thread.mailbox, meth, args, block)
@@ -96,11 +103,6 @@ module Celluloid
       end
     end
 
-    # Is this actor alive?
-    def alive?
-      @running
-    end
-
     # Is this actor running in exclusive mode?
     def exclusive?
       @exclusive
@@ -117,7 +119,6 @@ module Celluloid
     # Terminate this actor
     def terminate
       @running = false
-      nil
     end
 
     # Send a signal with the given name to all waiting methods
@@ -144,6 +145,8 @@ module Celluloid
           rescue ExitEvent => exit_event
             Task.new(:exit_handler) { handle_exit_event exit_event }.resume
             retry
+          rescue TerminationRequest
+            break
           end
 
           if message

data/lib/celluloid/actor_proxy.rb

@@ -54,18 +54,14 @@ module Celluloid
 
     # Terminate the associated actor
     def terminate
-      raise DeadActorError, "actor already terminated" unless alive?
-
-      begin
-        _send_ :terminate
-      rescue DeadActorError
-        # In certain cases this is thrown during termination. This is likely
-        # a bug in Celluloid's internals, but it shouldn't affect the caller.
-        # FIXME: track this down and fix it, or at the very least log it
-      end
+      terminate!
+      Thread.pass while alive?
+    end
 
-      # Always return nil until a dependable exit value can be obtained
-      nil
+    # Terminate the associated actor asynchronously
+    def terminate!
+      raise DeadActorError, "actor already terminated" unless alive?
+      @mailbox.system_event TerminationRequest.new
     end
 
     # method_missing black magic to call bang predicate methods asynchronously

data/lib/celluloid/events.rb

@@ -11,4 +11,7 @@ module Celluloid
       super reason.to_s
     end
   end
+  
+  # Request for an actor to terminate
+  class TerminationRequest < SystemEvent; end
 end

data/lib/celluloid/mailbox.rb

@@ -28,7 +28,8 @@ module Celluloid
         @messages << message
         @condition.signal
         nil
-      ensure @mutex.unlock
+      ensure
+        @mutex.unlock rescue nil
       end
     end
 
@@ -41,7 +42,8 @@ module Celluloid
           @condition.signal
         end
         nil
-      ensure @mutex.unlock
+      ensure
+        @mutex.unlock rescue nil
       end
     end
 
@@ -71,7 +73,8 @@ module Celluloid
         end until message
 
         message
-      ensure @mutex.unlock
+      ensure
+        @mutex.unlock rescue nil
       end
     end
 
@@ -100,7 +103,8 @@ module Celluloid
         messages = @messages
         @messages = []
         @dead = true
-      ensure @mutex.unlock
+      ensure
+        @mutex.unlock rescue nil
       end
 
       messages.each { |msg| msg.cleanup if msg.respond_to? :cleanup }

data/lib/celluloid/pool.rb

@@ -3,6 +3,7 @@ module Celluloid
   class Pool
     include Celluloid
     trap_exit :crash_handler
+    attr_reader :max_actors
 
     # Takes a class of actor to pool and a hash of options:
     #
@@ -10,9 +11,10 @@ module Celluloid
     # * max_size: maximum number of actors (default one actor per CPU core)
     # * args: an array of arguments to pass to the actor's initialize
     def initialize(klass, options = {})
+      raise ArgumentError, "A Pool has a minimum size of 2" if options[:max_size] && options[:max_size] < 2
       opts = {
         :initial_size => 1,
-        :max_size     => Celluloid.cores,
+        :max_size     => [Celluloid.cores, 2].max,
         :args         => []
       }.merge(options)
 

data/lib/celluloid/version.rb

@@ -1,4 +1,4 @@
 module Celluloid
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
   def self.version; VERSION; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70275106519080 !ruby/object:Gem::Requirement
+  requirement: &70363787045800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275106519080
+  version_requirements: *70363787045800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70275106518620 !ruby/object:Gem::Requirement
+  requirement: &70363787045200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275106518620
+  version_requirements: *70363787045200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70275106518200 !ruby/object:Gem::Requirement
+  requirement: &70363787044600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275106518200
+  version_requirements: *70363787044600
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70275106517780 !ruby/object:Gem::Requirement
+  requirement: &70363787044060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275106517780
+  version_requirements: *70363787044060
 description: Celluloid enables people to build concurrent programs out of concurrent
   objects just as easily as they build sequential programs out of sequential objects
 email:
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Actor-based concurrent object framework for Ruby
 test_files: []
-has_rdoc: