opee 0.0.2 → 0.0.3

data/README.md

@@ -12,15 +12,16 @@ be written to improve performance.
 
 This is no where close to being ready for prime time.
 
-# Plans and Notes
+## <a name="release">Release Notes</a>
 
-- Env
- - test
-  - create and close actors and make sure each_actor changes
-  - test logger return Log instance
-  - queue_count
-  - start/stop
-  - wait_close
+### Release 0.0.3
+
+ - Filled out Env and Actor tests.
+
+ - Fixed ordering problem with method execution.
+
+
+# Plans and Notes
 
 - Log
   - allow forward attribute to be set that forwards messages to another Actor
@@ -29,6 +30,7 @@ This is no where close to being ready for prime time.
    - set formatter and stringio and test env methods
    - test forwarding
 
+- Env
 - Actor
 
 - implement a design pattern for a shared work queue

data/lib/opee/actor.rb

@@ -63,21 +63,21 @@ module Opee
     # deep copy and freeze args if not already frozen or primitive types
     def ask(op, *args)
       @ask_mutex.synchronize {
-        @queue << Act.new(op, args)
+        @queue.insert(0, Act.new(op, args))
       }
       @loop.wakeup() if RUNNING == @state
     end
 
     def on_idle(op, *args)
       @idle_mutex.synchronize {
-        @idle << Act.new(op, args)
+        @idle.insert(0, Act.new(op, args))
       }
       @loop.wakeup() if RUNNING == @state
     end
 
     def priority_ask(op, *args)
       @priority_mutex.synchronize {
-        @priority << Act.new(op, args)
+        @priority.insert(0, Act.new(op, args))
       }
       @loop.wakeup() if RUNNING == @state
     end
@@ -101,6 +101,10 @@ module Opee
       sleep(max_wait)
     end
 
+    def wakeup()
+      @loop.wakeup()
+    end
+
     def start()
       @state = RUNNING
       @loop.wakeup()

data/lib/opee/env.rb

@@ -18,6 +18,10 @@ module Opee
       @@actors.each { |a| blk.yield(a) }
     end
 
+    def self.actor_count()
+      @@actors.size
+    end
+
     def self.shutdown()
       until @@actors.empty?
         a = @@actors.pop()
@@ -62,6 +66,7 @@ module Opee
 
     def self.wait_finish()
       @@finish_thread = Thread.current
+      @@actors.each { |a| a.wakeup() }
       while 0 < queue_count()
         sleep(0.2) # actors should wake up when queue is empty
       end

data/lib/opee/version.rb

@@ -1,5 +1,5 @@
 
 module Opee
   # Current version of the module. 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/test/relay.rb

@@ -3,13 +3,18 @@ require 'opee'
 
 class Relay < ::Opee::Actor
   attr_reader :last_data
+  attr_reader :buddy
 
-  def initialize(buddy)
-    super
-    @buddy = buddy
+  def initialize(options={})
+    @buddy = nil
     @last_data = nil
+    super(options)
   end
   
+  def set_options(options)
+    @buddy = options[:buddy]
+  end
+
   private
 
   def relay(data)

data/test/tc_opee_actor.rb

@@ -12,7 +12,7 @@ require 'relay'
 class OpeeTest < ::Test::Unit::TestCase
 
   def test_opee_actor_queue
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     assert_equal(0, a.queue_count())
     a.stop()
     a.ask(:relay, 5)
@@ -23,7 +23,7 @@ class OpeeTest < ::Test::Unit::TestCase
   end
 
   def test_opee_actor_ask
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.ask(:relay, 7)
     sleep(0.5) # minimize dependencies for simplest possible test
     assert_equal(7, a.last_data)
@@ -31,7 +31,7 @@ class OpeeTest < ::Test::Unit::TestCase
   end
 
   def test_opee_actor_method_missing
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.relay(7)
     ::Opee::Env.wait_close()
     assert_equal(7, a.last_data)
@@ -39,13 +39,13 @@ class OpeeTest < ::Test::Unit::TestCase
   end
 
   def test_opee_actor_raise_after_close
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.close()
     assert_raise(ThreadError) { a.start() }
   end
 
   def test_opee_actor_priority
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.priority_ask(:relay, 7)
     ::Opee::Env.wait_close()
     assert_equal(7, a.last_data)
@@ -53,7 +53,7 @@ class OpeeTest < ::Test::Unit::TestCase
   end
 
   def test_opee_actor_idle
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.on_idle(:relay, 7)
     ::Opee::Env.wait_close()
     assert_equal(7, a.last_data)
@@ -61,7 +61,7 @@ class OpeeTest < ::Test::Unit::TestCase
   end
 
   def test_opee_actor_order
-    a = ::Relay.new(nil)
+    a = ::Relay.new()
     a.stop()
     a.on_idle(:relay, 17)
     a.priority_ask(:relay, 3)

data/test/tc_opee_env.rb

@@ -11,12 +11,53 @@ require 'relay'
 
 class OpeeTest < ::Test::Unit::TestCase
 
-  def test_wait_close
-    a = ::Relay.new(nil)
-    a.ask(:relay, 7)
+  def test_opee_env_add_remove
+    assert_equal(0, ::Opee::Env.actor_count)
+    a = ::Relay.new()
+    assert_equal(1, ::Opee::Env.actor_count)
+    a.close()
+    assert_equal(0, ::Opee::Env.actor_count)
+  end
+
+  def test_opee_env_each_actor
+    a = ::Relay.new()
+    b = ::Relay.new()
+    c = ::Relay.new()
+    all = []
+    ::Opee::Env.each_actor { |x| all << x }
+    assert_equal([a, b, c], all)
+    a.close()
+    b.close()
+    c.close()
+  end
+
+  def test_opee_env_shutdown
+    a = ::Relay.new()
+    ::Opee::Env.shutdown
+    assert_raise(ThreadError) { a.start() }
+  end
+
+  def test_opee_env_wait_close
+    # chain 3 together to make sure all processing is completed
+    a = ::Relay.new()
+    b = ::Relay.new(:buddy => a)
+    c = ::Relay.new(:buddy => b)
+    c.ask(:relay, 7)
     ::Opee::Env.wait_close()
     assert_equal(7, a.last_data)
     a.close()
   end
 
+  def test_opee_env_start_stop
+    a = ::Relay.new()
+    ::Opee::Env.stop()
+    a.ask(:relay, 5)
+    assert_equal(1, ::Opee::Env.queue_count())
+    a.ask(:relay, 7)
+    assert_equal(2, ::Opee::Env.queue_count())
+    ::Opee::Env.start()
+    ::Opee::Env.wait_close()
+    assert_equal(7, a.last_data)
+  end
+
 end # OpeeTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opee
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies: []
 description: ! 'An experimental Object-base Parallel Evaluation Environment. '
 email: peter@ohler.com