opee 0.0.3 → 0.0.4

data/README.md

@@ -12,37 +12,34 @@ be written to improve performance.
 
 This is no where close to being ready for prime time.
 
-## <a name="release">Release Notes</a>
+Any comments, thoughts, or suggestions are welcome.
 
-### Release 0.0.3
+## <a name="release">Release Notes</a>
 
- - Filled out Env and Actor tests.
+### Release 0.0.4
 
- - Fixed ordering problem with method execution.
+ - Filling in the Log class and unit tests for it.
 
+ - Added WorkQueue but have not tested it yet.
 
 # Plans and Notes
 
-- Log
-  - allow forward attribute to be set that forwards messages to another Actor
-  - turn output off (useful when there is a forward actor)
-  - test
-   - set formatter and stringio and test env methods
-   - test forwarding
-
-- Env
-- Actor
-
-- implement a design pattern for a shared work queue
- - queue is an actor
- - place items on queue either as normal ask sequence or special mutex protected queue
-  - if normal then wait for a request for a job and send a job to requestor
+- WorkQueue test tc_opee_workqueue
 
 - pick a problem to test against
- - checkers
- - process some kind of file
- - process random numbers to produce something
- - life
+ - file density distribution
+  - find all files under a directory
+  - detemine if the file is a text or bin file and only keep text files
+  - read in the text file and on work queue
+  - worker determines density of file (non-white/total)
+  - pass on to summary actor
+  - wait_finish
+  - ask to print or write report
+
+- implement Actor max_queue_count limiter
+ - test with actor that reports queue size and pauses for 0.1 seconds
+ - try to send too many requests at it so it has to report busy
+
 
 - describe patterns for use
 

data/lib/opee.rb

@@ -5,3 +5,4 @@ end # Opee
 require 'opee/env'
 require 'opee/actor'
 require 'opee/log'
+require 'opee/workqueue'

data/lib/opee/actor.rb

@@ -83,6 +83,7 @@ module Opee
     end
 
     def method_missing(m, *args, &blk)
+      raise NoMethodError.new("undefine method '#{m}' for #{self.class}", m, args) unless respond_to?(m, true)
       ask(m, *args)
     end
 

data/lib/opee/env.rb

@@ -27,6 +27,7 @@ module Opee
         a = @@actors.pop()
         a.close()
       end
+      @@log = nil
     end
 
     def self.log(severity, message)
@@ -34,6 +35,26 @@ module Opee
       @@log.ask(:log, severity, message)
     end
 
+    def self.debug(message)
+      log(Logger::Severity::DEBUG, message)
+    end
+
+    def self.info(message)
+      log(Logger::Severity::INFO, message)
+    end
+
+    def self.warn(message)
+      log(Logger::Severity::WARN, message)
+    end
+
+    def self.error(message)
+      log(Logger::Severity::ERROR, message)
+    end
+
+    def self.fatal(message)
+      log(Logger::Severity::FATAL, message)
+    end
+
     def self.log_rescue(ex)
       @@log = Log.new() if @@log.nil?
       return unless Logger::Severity::ERROR >= @@log.level
@@ -49,6 +70,12 @@ module Opee
       @@log
     end
 
+    def self.logger=(log_actor)
+      @@log.close() unless @@log.nil?
+      @@log = log_actor
+      @@log
+    end
+
     def self.queue_count()
       cnt = 0
       @@actors.each { |a| cnt += a.queue_count() }
@@ -83,6 +110,7 @@ module Opee
         break if 0 == queue_count()
         start()
       end
+      @@log = nil
       until @@actors.empty?
         a = @@actors.pop()
         a.close()

data/lib/opee/log.rb

@@ -5,17 +5,66 @@ module Opee
   class Log < Actor
 
     def initialize(options={})
+      @logger = nil
+      @forward = nil
       super(options)
     end
 
+    def level()
+      @logger.level
+    end
+
+    def formatter()
+      @logger.formatter
+    end
+
+    def forward()
+      @forward
+    end
+
     private
-    # use ask() to invoke private methods
+    # Use ask() to invoke private methods. If called directly they will be
+    # picked up by the Actor method_missing() method.
 
     def set_options(options)
-      @logger = Logger.new(STDOUT)
+      if !(filename = options[:filename]).nil?
+        max_file_size = options.fetch(:max_file_size, options.fetch(:shift_size, 1048576))
+        max_file_count = options.fetch(:max_file_count, options.fetch(:shift_age, 7))
+        @logger = Logger.new(filename, max_file_count, max_file_size)
+      elsif !(stream = options[:stream]).nil?
+        @logger = Logger.new(stream)
+      else
+        @logger = Logger.new(STDOUT)
+      end
       severity = options[:severity] if options.has_key?(:severity)
+      formatter = options[:formatter] if options.has_key?(:formatter)
+    end
+
+    def log(severity, message)
+      @logger.add(severity, message)
+      @forward.log(severity, message) unless @forward.nil?
+    end
+
+    def stream=(stream)
+      logger = Logger.new(stream)
+      logger.level = @logger.level
+      logger.formatter = @logger.formatter
+      @logger = logger
+    end
+
+    def set_filename(filename, shift_age=7, shift_size=1048576)
+      logger = Logger.new(filename, shift_age, shift_size)
+      logger.level = @logger.level
+      logger.formatter = @logger.formatter
+      @logger = logger
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
 
-      # TBD options for setting a file, severity, max_file_size, max_file_count, formatter
+    def forward=(forward_actor)
+      @forward = forward_actor
     end
 
     def severity=(level)
@@ -35,8 +84,8 @@ module Opee
       @logger.level = level
     end
 
-    def log(severity, message)
-      @logger.add(severity, message)
+    def formatter=(proc)
+      @logger.formatter = proc
     end
 
   end # Log

data/lib/opee/version.rb

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

data/lib/opee/workqueue.rb

@@ -0,0 +1,41 @@
+
+module Opee
+  class WorkQueue < Actor
+
+    def initialize(options={})
+      @workers = []
+      @work_queue = []
+      @method = nil
+      super(options)
+    end
+
+    def work_queue_size()
+      @work_queue.size
+    end
+
+    private
+
+    def set_options(options)
+      raise "A method for for processing jobs must be specified" if (@method = options[:method]).nil?
+    end
+
+    def add(job)
+      if @workers.empty?
+        @work_queue.insert(0, job)
+      else
+        worker = @workers.pop()
+        worker.ask(@method, job)
+      end
+    end
+
+    def ready(worker)
+      if @work_queue.empty?
+        @workers.insert(0, worker) unless @workers.include?(worker)
+      else
+        job = @work_queue.pop()
+        worker.ask(@method, job)
+      end
+    end
+
+  end # WorkQueue
+end # Opee

data/test/tc_opee_actor.rb

@@ -38,6 +38,12 @@ class OpeeTest < ::Test::Unit::TestCase
     a.close()
   end
 
+  def test_opee_actor_really_missing
+    a = ::Relay.new()
+    assert_raise(NoMethodError) { a.xray(7) }
+    a.close()
+  end
+
   def test_opee_actor_raise_after_close
     a = ::Relay.new()
     a.close()

data/test/tc_opee_log.rb

@@ -6,16 +6,53 @@
 ].each { |path| $: << path unless $:.include?(path) }
 
 require 'test/unit'
+require 'stringio'
 require 'opee'
 
 class OpeeTest < ::Test::Unit::TestCase
 
   def test_opee_log_log
-    #::Opee::Env.logger.ask(:severity=, Logger::INFO)
-    ::Opee::Env.logger.severity= Logger::INFO
-    ::Opee::Env.log(Logger::INFO, "hello")
-    ::Opee::Env.each_actor { |a| puts a.to_s }
-    sleep(0.2)
+    stream = StringIO.new()
+    ::Opee::Env.logger = ::Opee::Log.new(:stream => stream)
+    ::Opee::Env.logger.severity = Logger::INFO
+    ::Opee::Env.logger.formatter = proc { |sev, time, prog, msg| "#{sev}: #{msg}\n" }
+    ::Opee::Env.log(Logger::FATAL, "dead")
+    ::Opee::Env.log(Logger::ERROR, "oops")
+    ::Opee::Env.log(Logger::WARN, "duck")
+    ::Opee::Env.log(Logger::INFO, "something")
+    ::Opee::Env.log(Logger::DEBUG, "bugs")
+    ::Opee::Env.wait_close()
+    assert_equal(%{FATAL: dead
+ERROR: oops
+WARN: duck
+INFO: something
+}, stream.string)
+  end
+
+  def test_opee_log_filename
+    filename = 'filename_test.log'
+    %x{rm -f #{filename}}
+    ::Opee::Env.logger = ::Opee::Log.new(:filename => filename)
+    ::Opee::Env.logger.severity = Logger::INFO
+    ::Opee::Env.logger.formatter = proc { |sev, time, prog, msg| "#{sev}: #{msg}\n" }
+    ::Opee::Env.info("first entry")
+    ::Opee::Env.wait_close()
+    output = File.read(filename).split("\n")[1..-1]
+    assert_equal(['INFO: first entry'], output)
+    %x{rm #{filename}}
+  end
+
+  def test_opee_log_set_filename
+    filename = 'set_filename_test.log'
+    %x{rm -f #{filename}}
+    ::Opee::Env.logger.severity = Logger::INFO
+    ::Opee::Env.logger.formatter = proc { |sev, time, prog, msg| "#{sev}: #{msg}\n" }
+    ::Opee::Env.logger.set_filename(filename, 2, 1000)
+    ::Opee::Env.info("first entry")
+    ::Opee::Env.wait_close()
+    output = File.read(filename).split("\n")[1..-1]
+    assert_equal(['INFO: first entry'], output)
+    %x{rm #{filename}}
   end
 
 end # OpeeTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opee
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies: []
 description: ! 'An experimental Object-base Parallel Evaluation Environment. '
 email: peter@ohler.com
@@ -22,6 +22,7 @@ files:
 - lib/opee/env.rb
 - lib/opee/log.rb
 - lib/opee/version.rb
+- lib/opee/workqueue.rb
 - lib/opee.rb
 - test/relay.rb
 - test/tc_opee_actor.rb
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: opee
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An experimental Object-base Parallel Evaluation Environment.