Supervised and linked by default

Pass spawn options to behaviours

Author: pitr-ch

lib/concurrent/actor/behaviour/abstract.rb

@@ -7,7 +7,7 @@ class Abstract
 
         attr_reader :core, :subsequent
 
-        def initialize(core, subsequent)
+        def initialize(core, subsequent, core_options)
           @core       = Type! core, Core
           @subsequent = Type! subsequent, Abstract, NilClass
         end

lib/concurrent/actor/behaviour/buffer.rb

@@ -8,8 +8,8 @@ module Behaviour
       # and they can be processed before messages arriving into buffer. This allows to
       # process internal actor messages like (`:link`, `:supervise`) processed first.
       class Buffer < Abstract
-        def initialize(core, subsequent)
-          super core, subsequent
+        def initialize(core, subsequent, core_options)
+          super core, subsequent, core_options
           @buffer                     = []
           @receive_envelope_scheduled = false
         end

lib/concurrent/actor/behaviour/linking.rb

@@ -38,9 +38,12 @@ module Behaviour
       #     got event #<RuntimeError: failed> from #<Concurrent::Actor::Reference /an_actor (Concurrent::Actor::Utils::AdHoc)>
       #     got event :reset from #<Concurrent::Actor::Reference /an_actor (Concurrent::Actor::Utils::AdHoc)>
       class Linking < Abstract
-        def initialize(core, subsequent)
-          super core, subsequent
+        def initialize(core, subsequent, core_options)
+          super core, subsequent, core_options
           @linked = Set.new
+          if core_options[:link] != false || core_options[:supervise] != false
+            @linked.add Actor.current
+          end
         end
 
         def on_envelope(envelope)

lib/concurrent/actor/behaviour/pausing.rb

@@ -8,8 +8,8 @@ module Behaviour
       # Reset also reinitialized context.
       # @note TODO missing example
       class Pausing < Abstract
-        def initialize(core, subsequent)
-          super core, subsequent
+        def initialize(core, subsequent, core_options)
+          super core, subsequent, core_options
           @paused = false
           @buffer = []
         end

lib/concurrent/actor/behaviour/sets_results.rb

@@ -5,8 +5,8 @@ module Behaviour
       class SetResults < Abstract
         attr_reader :error_strategy
 
-        def initialize(core, subsequent, error_strategy)
-          super core, subsequent
+        def initialize(core, subsequent, core_options, error_strategy)
+          super core, subsequent, core_options
           @error_strategy = Match! error_strategy, :just_log, :terminate!, :pause!
         end
 

lib/concurrent/actor/behaviour/supervised.rb

@@ -27,9 +27,14 @@ module Behaviour
       class Supervised < Abstract
         attr_reader :supervisor
 
-        def initialize(core, subsequent)
-          super core, subsequent
-          @supervisor = nil
+        def initialize(core, subsequent, core_options)
+          super core, subsequent, core_options
+
+          @supervisor = if core_options[:supervise] != false
+                          Actor.current
+                        else
+                          nil
+                        end
         end
 
         def on_envelope(envelope)

lib/concurrent/actor/behaviour/supervising.rb

@@ -5,9 +5,10 @@ module Behaviour
       # Handles supervised actors. Handle configures what to do with failed child: :terminate!, :resume!, :reset!,
       # or :restart!. Strategy sets :one_for_one (restarts just failed actor) or :one_for_all (restarts all child actors).
       # @note TODO missing example
+      # @note this will change in next version to support supervision trees better
       class Supervising < Abstract
-        def initialize(core, subsequent, handle, strategy)
-          super core, subsequent
+        def initialize(core, subsequent, core_options, handle, strategy)
+          super core, subsequent, core_options
           @handle   = Match! handle, :terminate!, :resume!, :reset!, :restart!
           @strategy = case @handle
                       when :terminate!

lib/concurrent/actor/behaviour/termination.rb

@@ -11,8 +11,8 @@ class Termination < Abstract
         #   @return [Event] event which will become set when actor is terminated.
         attr_reader :terminated
 
-        def initialize(core, subsequent)
-          super core, subsequent
+        def initialize(core, subsequent, core_options)
+          super core, subsequent, core_options
           @terminated = Concurrent::Event.new
         end
 

lib/concurrent/actor/core.rb

@@ -36,8 +36,8 @@ class Core
       # @option opts [Context] actor_class a class to be instantiated defining Actor's behaviour
       # @option opts [Array<Object>] args arguments for actor_class instantiation
       # @option opts [Executor] executor, default is `Concurrent.configuration.global_task_pool`
-      # @option opts [true, false] link, atomically link the actor to its parent
-      # @option opts [true, false] supervise, atomically supervise the actor by its parent
+      # @option opts [true, false] link, atomically link the actor to its parent (default: true)
+      # @option opts [true, false] supervise, atomically supervise the actor by its parent (default: true)
       # @option opts [Class] reference a custom descendant of {Reference} to use
       # @option opts [Array<Array(Behavior::Abstract, Array<Object>)>] behaviour_definition, array of pairs
       #   where each pair is behaviour class and its args, see {Behaviour.basic_behaviour_definition}
@@ -78,19 +78,9 @@ def initialize(opts = {}, &block)
           @block      = block
           initialized = Type! opts[:initialized], IVar, NilClass
 
-          messages = []
-          messages << :link if opts[:link]
-          messages << :supervise if opts[:supervise]
-
           schedule_execution do
             begin
               build_context
-
-              messages.each do |message|
-                log DEBUG, "preprocessing #{message.inspect} from #{parent}"
-                process_envelope Envelope.new(message, nil, parent, reference)
-              end
-
               initialized.set reference if initialized
             rescue => ex
               log ERROR, ex
@@ -221,7 +211,7 @@ def initialize_behaviours(opts)
         end
         @behaviours           = {}
         @first_behaviour      = @behaviour_definition.reverse.
-            reduce(nil) { |last, (behaviour, args)| @behaviours[behaviour] = behaviour.new(self, last, *args) }
+            reduce(nil) { |last, (behaviour, args)| @behaviours[behaviour] = behaviour.new(self, last, opts, *args) }
       end
     end
   end

spec/spec_helper.rb

@@ -17,8 +17,17 @@
 
 require 'concurrent'
 
-logger                          = Logger.new($stderr)
-logger.level                    = Logger::WARN
+logger       = Logger.new($stderr)
+logger.level = Logger::WARN
+
+logger.formatter = lambda do |severity, datetime, progname, msg|
+  format "[%s] %5s -- %s: %s\n",
+         datetime.strftime('%Y-%m-%d %H:%M:%S.%L'),
+         severity,
+         progname,
+         msg
+end
+
 Concurrent.configuration.logger = lambda do |level, progname, message = nil, &block|
   logger.add level, message, progname, &block
 end