Add Actress specs

Author: pitr-ch

lib/concurrent/actress/reference.rb

@@ -1,7 +1,9 @@
 module Concurrent
   module Actress
 
-    # Reference serves as public interface to send messages to Actors and can freely passed around
+    # Reference is public interface of Actor instances. It is used for sending messages and can
+    # be freely passed around the program. It also provides some basic information about the actor
+    # see {CoreDelegations}
     class Reference
       include TypeCheck
       include CoreDelegations

lib/concurrent/executor/executor.rb

@@ -4,6 +4,10 @@
 module Concurrent
 
   module Executor
+  end
+
+  module RubyExecutor
+    include Executor
 
     # Submit a task to the executor for asynchronous processing.
     #
@@ -120,6 +124,7 @@ def kill_execution
   if RUBY_PLATFORM == 'java'
 
     module JavaExecutor
+      include Executor
 
       # Submit a task to the executor for asynchronous processing.
       #

lib/concurrent/executor/immediate_executor.rb

@@ -1,5 +1,6 @@
 module Concurrent
   class ImmediateExecutor
+    include Executor
 
     def post(*args, &task)
       raise ArgumentError.new('no block given') unless block_given?

lib/concurrent/executor/ruby_single_thread_executor.rb

@@ -4,7 +4,7 @@ module Concurrent
 
   # @!macro single_thread_executor
   class RubySingleThreadExecutor
-    include Executor
+    include RubyExecutor
 
     # Create a new thread pool.
     #

lib/concurrent/executor/ruby_thread_pool_executor.rb

@@ -8,7 +8,7 @@ module Concurrent
 
   # @!macro thread_pool_executor
   class RubyThreadPoolExecutor
-    include Executor
+    include RubyExecutor
 
     # Default maximum number of threads that will be created in the pool.
     DEFAULT_MAX_POOL_SIZE = 2**15 # 32768

lib/concurrent/executor/timer_set.rb

@@ -11,7 +11,7 @@ module Concurrent
   # monitors the set and schedules each task for execution at the appropriate
   # time. Tasks are run on the global task pool or on the supplied executor.
   class TimerSet
-    include Executor
+    include RubyExecutor
 
     # Create a new set of timed tasks.
     #

lib/concurrent/timer_task.rb

@@ -146,7 +146,7 @@ module Concurrent
   # @see http://docs.oracle.com/javase/7/docs/api/java/util/TimerTask.html
   class TimerTask
     include Dereferenceable
-    include Executor
+    include RubyExecutor
     include Concurrent::Observable
 
     # Default `:execution_interval` in seconds.

spec/concurrent/actress_spec.rb

@@ -1,88 +1,163 @@
 require 'spec_helper'
 require 'concurrent/actress'
 
-EXECUTOR = Concurrent::ThreadPoolExecutor.new(
-    min_threads:     [2, Concurrent.processor_count].max,
-    max_threads:     [20, Concurrent.processor_count * 15].max,
-    idletime:        2 * 60, # 2 minutes
-    max_queue:       0, # unlimited
-    overflow_policy: :abort # raise an exception
-)
+module Concurrent
+  module Actress
+    describe 'Concurrent::Actress' do
 
-describe Concurrent::Actress do
+      class Ping
+        include Context
 
-  class Ping
-    include Concurrent::Actress::Context
+        def initialize(queue)
+          @queue = queue
+        end
 
-    def initialize(queue)
-      @queue = queue
-    end
+        def on_message(message)
+          case message
+          when :terminate
+            terminate!
+          when :child
+            AdHoc.spawn(:pong, @queue) { |queue| -> m { queue << m } }
+          else
+            @queue << message
+            message
+          end
+        end
+      end
 
-    def on_message(message)
-      case message
-      when :terminate
-        terminate!
-      when :child
-        Concurrent::Actress::AdHoc.spawn(name: :pong, executor: EXECUTOR) { -> m { @queue << m } }
-      else
-        @queue << message
-        message
+      # def trace!
+      #   set_trace_func proc { |event, file, line, id, binding, classname|
+      #     # thread = eval('Thread.current', binding).object_id.to_s(16)
+      #     printf "%8s %20s %20s %s %s:%-2d\n", event, id, classname, nil, file, line
+      #   }
+      #   yield
+      # ensure
+      #   set_trace_func nil
+      # end
+
+      def assert condition
+        unless condition
+          # require 'pry'
+          # binding.pry
+          raise
+          puts "--- \n#{caller.join("\n")}"
+        end
       end
-    end
-  end
 
-  # def trace!
-  #   set_trace_func proc { |event, file, line, id, binding, classname|
-  #     # thread = eval('Thread.current', binding).object_id.to_s(16)
-  #     printf "%8s %20s %20s %s %s:%-2d\n", event, id, classname, nil, file, line
-  #   }
-  #   yield
-  # ensure
-  #   set_trace_func nil
-  # end
-
-  def assert condition
-    unless condition
-      # require 'pry'
-      # binding.pry
-      raise
-      puts "--- \n#{caller.join("\n")}"
-    end
-  end
+      describe 'stress test' do
+        1.times do |i|
+          it format('run %3d', i) do
+            # puts format('run %3d', i)
+            Array.new(10).map do
+              Thread.new do
+                10.times do
+                  # trace! do
+                  queue = Queue.new
+                  actor = Ping.spawn :ping, queue
+
+                  # when spawn returns children are set
+                  assert Concurrent::Actress::ROOT.send(:core).instance_variable_get(:@children).include?(actor)
+
+                  actor << 'a' << 1
+                  assert queue.pop == 'a'
+                  assert actor.ask(2).value == 2
 
+                  assert actor.parent == Concurrent::Actress::ROOT
+                  assert Concurrent::Actress::ROOT.path == '/'
+                  assert actor.path == '/ping'
+                  child = actor.ask(:child).value
+                  assert child.path == '/ping/pong'
+                  queue.clear
+                  child.ask(3)
+                  assert queue.pop == 3
 
-  # FIXME increasing this does not work in Rspec environment
-  1.times do |i|
-    it format('run %3d', i) do
-      # puts format('run %3d', i)
-      Array.new(10).map do
-        Thread.new do
-          10.times do
-            # trace! do
-            queue = Queue.new
-            actor = Ping.spawn name: :ping, executor: EXECUTOR, args: [queue]
-
-            # when spawn returns children are set
-            assert Concurrent::Actress::ROOT.send(:core).instance_variable_get(:@children).include?(actor)
-
-            actor << 'a' << 1
-            assert queue.pop == 'a'
-            assert actor.ask(2).value == 2
-
-            assert actor.parent == Concurrent::Actress::ROOT
-            assert Concurrent::Actress::ROOT.path == '/'
-            assert actor.path == '/ping'
-            child = actor.ask(:child).value
-            assert child.path == '/ping/pong'
-            queue.clear
-            child.ask(3)
-            assert queue.pop == 3
-
-            actor << :terminate
-            assert actor.ask(:blow_up).wait.rejected?
+                  actor << :terminate
+                  assert actor.ask(:blow_up).wait.rejected?
+                end
+              end
+            end.each(&:join)
           end
         end
-      end.each(&:join)
+      end
+
+      describe 'spawning' do
+        describe 'Actress#spawn' do
+          behaviour = -> v { -> _ { v } }
+          subjects  = { spawn:                 -> { Actress.spawn(AdHoc, :ping, 'arg', &behaviour) },
+                        context_spawn:         -> { AdHoc.spawn(:ping, 'arg', &behaviour) },
+                        spawn_by_hash:         -> { Actress.spawn(class: AdHoc, name: :ping, args: ['arg'], &behaviour) },
+                        context_spawn_by_hash: -> { AdHoc.spawn(name: :ping, args: ['arg'], &behaviour) } }
+
+          subjects.each do |desc, subject_definition|
+            describe desc do
+              subject &subject_definition
+              its(:path) { should eq '/ping' }
+              its(:parent) { should eq ROOT }
+              its(:name) { should eq 'ping' }
+              its(:executor) { should eq Concurrent.configuration.global_task_pool }
+              its(:reference) { should eq subject }
+              it 'returns ars' do
+                subject.ask!(:anything).should eq 'arg'
+              end
+            end
+          end
+        end
+
+        it 'terminates on failed initialization' do
+          a = AdHoc.spawn(name: :fail, logger_level: 4) { raise }
+          a.ask(nil).wait.rejected?.should be_true
+          a.terminated?.should be_true
+        end
+
+        it 'terminates on failed message processing' do
+          a = AdHoc.spawn(name: :fail, logger_level: 4) { -> _ { raise } }
+          a.ask(nil).wait.rejected?.should be_true
+          a.terminated?.should be_true
+        end
+      end
+
+      describe 'messaging' do
+        subject { AdHoc.spawn(:add) { c = 0; -> v { c = c + v } } }
+        specify do
+          subject.tell(1).tell(1)
+          subject << 1 << 1
+          subject.ask(0).value!.should eq 4
+        end
+      end
+
+      describe 'children' do
+        let(:parent) do
+          AdHoc.spawn(:parent) do
+            -> message do
+              if message == :child
+                AdHoc.spawn(:child) { -> _ { parent } }
+              else
+                children
+              end
+            end
+          end
+        end
+
+        it 'has children set after a child is created' do
+          child = parent.ask!(:child)
+          parent.ask!(nil).should include(child)
+          child.ask!(nil).should eq parent
+        end
+      end
+
+      describe 'envelope' do
+        subject { AdHoc.spawn(:subject) { -> _ { envelope } } }
+        specify  do
+          envelope = subject.ask!('a')
+          envelope.should be_a_kind_of Envelope
+          envelope.message.should eq 'a'
+          envelope.ivar.should be_completed
+          envelope.ivar.value.should eq envelope
+          envelope.sender.should eq Thread.current
+        end
+      end
     end
+
   end
 end
+

spec/concurrent/atomic/atomic_boolean_spec.rb

@@ -151,7 +151,7 @@ module Concurrent
     end
   end
 
-  if jruby?
+  if TestHelpers.jruby?
 
     describe JavaAtomicBoolean do
       it_should_behave_like :atomic_boolean

spec/concurrent/atomic/atomic_fixnum_spec.rb

@@ -165,7 +165,7 @@ module Concurrent
     end
   end
 
-  if jruby?
+  if TestHelpers.jruby?
 
     describe JavaAtomicFixnum do
       it_should_behave_like :atomic_fixnum