Removing old #terminated? and #terminated methods

replacing with messages :terminated?, :terminated_event, :terminate!

Author: pitr-ch

lib/concurrent/actor/behaviour/termination.rb

@@ -22,12 +22,17 @@ def terminated?
         end
 
         def on_envelope(envelope)
-          if terminated?
-            reject_envelope envelope
-            MESSAGE_PROCESSED
+          case envelope.message
+          when :terminated?
+            terminated?
+          when :terminate!
+            terminate!
+          when :terminated_event
+            terminated
           else
-            if envelope.message == :terminate!
-              terminate!
+            if terminated?
+              reject_envelope envelope
+              MESSAGE_PROCESSED
             else
               pass envelope
             end
@@ -37,11 +42,11 @@ def on_envelope(envelope)
         # Terminates the actor. Any Envelope received after termination is rejected.
         # Terminates all its children, does not wait until they are terminated.
         def terminate!
-          return nil if terminated?
-          @terminated.set
+          return true if terminated?
+          terminated.set
           broadcast(:terminated)
           parent << :remove_child if parent
-          nil
+          true
         end
       end
     end

lib/concurrent/actor/core.rb

@@ -87,21 +87,12 @@ def initialize(opts = {}, &block)
             initialized.set true if initialized
           rescue => ex
             log ERROR, ex
-            terminate!
+            @first_behaviour.terminate!
             initialized.fail ex if initialized
           end
         end
       end
 
-      def allocate_context
-        @context = @context_class.allocate
-      end
-
-      def build_context
-        @context.send :initialize_core, self
-        @context.send :initialize, *@args, &@block
-      end
-
       # @return [Reference, nil] of parent actor
       def parent
         @parent_core && @parent_core.reference
@@ -142,21 +133,6 @@ def on_envelope(envelope)
         nil
       end
 
-      # @see Behaviour::Termination#terminated?
-      def terminated?
-        behaviour!(Behaviour::Termination).terminated?
-      end
-
-      # @see Behaviour::Termination#terminated!
-      def terminate!
-        behaviour!(Behaviour::Termination).terminate!
-      end
-
-      # @see Behaviour::Termination#terminated
-      def terminated
-        behaviour!(Behaviour::Termination).terminated
-      end
-
       # ensures that we are inside of the executor
       def guard!
         unless Actor.current == reference
@@ -202,6 +178,17 @@ def behaviour!(behaviour_class)
         @behaviours.fetch behaviour_class
       end
 
+      # @api private
+      def allocate_context
+        @context = @context_class.allocate
+      end
+
+      # @api private
+      def build_context
+        @context.send :initialize_core, self
+        @context.send :initialize, *@args, &@block
+      end
+
       private
 
       def handle_envelope(envelope)

lib/concurrent/actor/internal_delegations.rb

@@ -10,7 +10,7 @@ def children
 
       # @see Core#terminate!
       def terminate!
-        core.terminate!
+        behaviour!(Behaviour::Termination).terminate!
       end
 
       # delegates to core.log

lib/concurrent/actor/public_delegations.rb

@@ -18,16 +18,6 @@ def parent
         core.parent
       end
 
-      # @see Behaviour::Termination#terminated?
-      def terminated?
-        core.terminated?
-      end
-
-      # @see Behaviour::Termination#terminated
-      def terminated
-        core.terminated
-      end
-
       # @see Core#reference
       def reference
         core.reference

spec/concurrent/actor_spec.rb

@@ -20,10 +20,8 @@ module Actor
 
       def terminate_actors(*actors)
         actors.each do |actor|
-          unless actor.terminated?
-            actor << :terminate!
-            actor.terminated.wait(2) or
-                raise 'timeout'
+          unless actor.ask!(:terminated?)
+            actor.ask!(:terminate!)
           end
         end
       end
@@ -134,7 +132,7 @@ def on_message(message)
         it 'terminates on failed initialization' do
           a = AdHoc.spawn(name: :fail, logger: Concurrent.configuration.no_logger) { raise }
           expect(a.ask(nil).wait.rejected?).to be_truthy
-          expect(a.terminated?).to be_truthy
+          expect(a.ask!(:terminated?)).to be_truthy
         end
 
         it 'terminates on failed initialization and raises with spawn!' do
@@ -146,7 +144,7 @@ def on_message(message)
         it 'terminates on failed message processing' do
           a = AdHoc.spawn(name: :fail, logger: Concurrent.configuration.no_logger) { -> _ { raise } }
           expect(a.ask(nil).wait.rejected?).to be_truthy
-          expect(a.terminated?).to be_truthy
+          expect(a.ask!(:terminated?)).to be_truthy
         end
       end
 
@@ -205,11 +203,11 @@ def on_message(message)
 
         it 'terminates with all its children' do
           child = subject.ask! :child
-          expect(subject.terminated?).to be_falsey
+          expect(subject.ask!(:terminated?)).to be_falsey
           subject.ask(:terminate!).wait
-          expect(subject.terminated?).to be_truthy
-          child.terminated.wait
-          expect(child.terminated?).to be_truthy
+          expect(subject.ask!(:terminated?)).to be_truthy
+          child.ask!(:terminated_event).wait
+          expect(child.ask!(:terminated?)).to be_truthy
 
           terminate_actors subject, child
         end