openwferu 0.9.11 → 0.9.12

data/lib/openwfe/storage/yamlfilestorage.rb

@@ -50,15 +50,17 @@ require 'openwfe/service'
 
 require 'openwfe/expressions/flowexpression'
 require 'openwfe/expressions/raw_xml'
+
     #
     # making sure classes in those files are loaded
     # before their yaml persistence is tuned
     # (else the reopening of the class is interpreted as
     # a definition of the class...)
 
-
 module OpenWFE
-    
+  
+
+  
     #
     # Stores OpenWFEru related objects into yaml encoded files.
     # This storage is meant to look and feel like a Hash.
@@ -144,6 +146,7 @@ module OpenWFE
             
             if not File.exist?(fei_path)
                 ldebug { "[] didn't find file at #{fei_path}" }
+                #puts  "[] didn't find file at #{fei_path}"
                 return nil 
             end
 
@@ -165,7 +168,7 @@ module OpenWFE
             def load_object (path)
 
                 object = YAML.load_file(path)
-                
+              
                 object.application_context = @application_context \
                     if object.respond_to? :application_context=
                 
@@ -213,6 +216,7 @@ module OpenWFE
             # Passes each object to the given block
             #
             def each_object (&block)
+
                 each_object_path do |path|
                     block.call load_object(path)
                 end

data/lib/openwfe/util/otime.rb

@@ -64,7 +64,7 @@ module OpenWFE
             date = DateTime.parse(date)
         end
 
-        s = date.to_s
+        s = date.to_s # this is costly
         s[10] = " "
 
         return s

data/lib/openwfe/util/safe.rb

@@ -86,6 +86,8 @@ module OpenWFE
     #
     def OpenWFE.instance_eval_safely (instance, code, safe_level)
 
+        return instance.instance_eval(code) if on_jruby?
+
         code.untaint
 
         r = nil
@@ -95,6 +97,8 @@ module OpenWFE
             r = instance.instance_eval(code)
         end.join
 
+        raise "cannot TAMPER with JRUBY_VERSION" if on_jruby?
+
         r
     end
 
@@ -103,6 +107,8 @@ module OpenWFE
     #
     def OpenWFE.eval_safely (code, safe_level, binding=nil)
 
+        return eval(code, binding) if on_jruby?
+
         code.untaint
 
         r = nil
@@ -112,6 +118,8 @@ module OpenWFE
             r = eval(code, binding)
         end.join
 
+        raise "cannot TAMPER with JRUBY_VERSION" if on_jruby?
+
         r
     end
 
@@ -138,6 +146,12 @@ module OpenWFE
 
         eval_safely(c, safe_level, binding)
     end
+
+    protected
+
+    def on_jruby?
+        defined?(JRUBY_VERSION) != nil
+    end
     
 end
 

data/lib/openwfe/util/scheduler.rb

@@ -40,7 +40,6 @@
 #
 
 require 'monitor'
-
 require 'openwfe/util/otime'
 
 
@@ -139,10 +138,16 @@ module OpenWFE
         def sstart
 
             @scheduler_thread = Thread.new do
+
+                if defined?(JRUBY_VERSION)
+                    require 'java'
+                    java.lang.Thread.current_thread.name = "openwferu scheduler (Ruby Thread)"
+                end
+
                 while true
                     break if @stopped
                     step
-                    sleep(@precision)
+                    sleep @precision
                 end
             end
         end
@@ -297,7 +302,6 @@ module OpenWFE
         # be used to unschedule the job.
         #
         def schedule (cron_line, params={}, &block)
-
             synchronize do
 
                 params = prepare_params(params)
@@ -398,7 +402,6 @@ module OpenWFE
             end
 
             def sschedule_at (at, params={}, &block)
-
                 synchronize do
 
                     #puts "0 at is '#{at.to_s}' (#{at.class})"
@@ -509,7 +512,7 @@ module OpenWFE
 
                 #puts "push() at '#{Time.at(job.at)}'"
 
-                return job.eid
+                job.eid
             end
 
             #

data/lib/openwfe/util/workqueue.rb

@@ -58,7 +58,7 @@ module OpenWFE
             @workqueue = []
             @workqueue_frequency = 0
 
-            OpenWFE::call_in_thread "expression_pool", self do
+            OpenWFE::call_in_thread "workqueue", self do
                 while true
                     break if @workqueue_frequency == nil
                     sleep @workqueue_frequency
@@ -81,6 +81,8 @@ module OpenWFE
         def stop_workqueue
             @workqueue_frequency = nil
             do_process_workqueue
+                #
+                # maybe could process the work queue until it's really empty
         end
 
         #
@@ -141,12 +143,17 @@ module OpenWFE
             #ldebug { "do_process_workqueue() #{q.size} items to process" }
 
             q.each do |elt|
-
+            
                 do_process_workelement elt
                     #
                     # exception management is now done in the 
                     # do_process_workelement method
             end
+
+            #
+            # TODO : have a pool of workers handle that
+
+            #q.size
         end
 
         protected

data/lib/openwfe/utils.rb

@@ -116,6 +116,7 @@ module OpenWFE
         return object if object.kind_of?(Fixnum)
         return object if object.kind_of?(TrueClass)
         return object if object.kind_of?(FalseClass)
+        return object if object.kind_of?(Symbol)
 
         return object.dup if object.kind_of?(String)
 
@@ -250,6 +251,19 @@ module OpenWFE
         s
     end
 
+    #
+    # Sets the name of the current thread (the attribute :name if it is
+    # a ruby thread, the java thread name if we're in JRuby)
+    #
+    def set_current_thread_name (name)
+       if defined?(JRUBY_VERSION)
+           require 'java'
+           java.lang.Thread.current_thread.name = "#{name} (Ruby Thread)"
+       else
+           Thread.current[:name] = name
+       end
+    end
+
     #
     # Some code for writing thinks like :
     #
@@ -268,6 +282,10 @@ module OpenWFE
         return unless block
 
         Thread.new do
+
+            #set_current_thread_name "call_in_thread() for '#{caller_name}'"
+            set_current_thread_name caller_name
+
             begin
                 #$SAFE = safe_level
                     #

data/lib/openwfe/version.rb

@@ -34,5 +34,5 @@
 #
 
 module OpenWFE
-    OPENWFERU_VERSION = '0.9.11'
+    OPENWFERU_VERSION = '0.9.12'
 end

data/test/atom_test.rb

@@ -30,28 +30,24 @@ class AtomTest < Test::Unit::TestCase
     #
     # test atom 0
     
-    class Atom0Definition < ProcessDefinition
-        def make
-            process_definition :name => "atom0", :revision => "0" do
-                sequence do
-
-                    set \
-                        :field => "atom_entry_title", 
-                        :value => "#{$run_index}"
-                    set \
-                        :field => "colour",
-                        :value => "blue"
-                    participant :ref => "feed0-alpha"
-
-                    set \
-                        :field => "atom_entry_title", 
-                        :value => "#{$run_index}"
-                    set \
-                        :field => "colour",
-                        :value => "red"
-                    participant :ref => "feed1-bravo"
-                end
-            end
+    class AtomDefinition0 < ProcessDefinition
+        sequence do
+
+            set \
+                :field => "atom_entry_title", 
+                :value => "#{$run_index}"
+            set \
+                :field => "colour",
+                :value => "blue"
+            participant :ref => "feed0-alpha"
+
+            set \
+                :field => "atom_entry_title", 
+                :value => "#{$run_index}"
+            set \
+                :field => "colour",
+                :value => "red"
+            participant :ref => "feed1-bravo"
         end
     end
 
@@ -67,7 +63,7 @@ class AtomTest < Test::Unit::TestCase
 
         feed1 = AtomParticipant.new(7) do |fe, participant, workitem|
 
-            t = Time.new.to_s
+            t = Time.now.to_s
 """
 <p>
     <h1>${f:colour}</h1>
@@ -86,13 +82,18 @@ class AtomTest < Test::Unit::TestCase
         @engine.register_participant("feed1-.*", feed1)
 
         $run_index = "first run"
-        @engine.launch(LaunchItem.new(Atom0Definition))
+        @engine.launch(LaunchItem.new(AtomDefinition0))
 
         $run_index = "second run"
-        @engine.launch(LaunchItem.new(Atom0Definition))
+        @engine.launch(LaunchItem.new(AtomDefinition0))
 
         $run_index = "third and last run"
-        @engine.launch(LaunchItem.new(Atom0Definition))
+        @engine.launch(LaunchItem.new(AtomDefinition0))
+
+        @engine.join_until_idle
+
+        assert File.exist?('work/atom_feed0-alpha.xml')
+        assert File.exist?('work/atom_feed1-bravo.xml')
     end
 
 end

data/test/fei_test.rb

@@ -109,12 +109,12 @@ class FeiTest < Test::Unit::TestCase
         fei0 = new_fei()
         s = fei0.to_s
         fei1 = OpenWFE::FlowExpressionId.to_fei(s)
+        fei2 = OpenWFE::FlowExpressionId.from_s(s)
 
         puts "\n#{s}\n#{fei1.to_s}" if fei0 != fei1
 
-        assert \
-            fei0 == fei1,
-            "fei .to_s() and .str_to_fei(s) are not working"
+        assert_equal fei0, fei1
+        assert_equal fei1, fei2
     end
 
     def test_parent_wfid

data/test/file_persistence_test.rb

@@ -2,8 +2,6 @@
 require 'test/unit'
 
 require 'openwfe/engine/engine'
-#require 'openwfe/flowexpressionid'
-#require 'openwfe/expressions/expressionmap'
 require 'openwfe/expool/expstorage'
 require 'openwfe/expool/yamlexpstorage'
 
@@ -16,6 +14,10 @@ class FilePersistenceTest < Test::Unit::TestCase
         @engine = Engine.new
     end
 
+    def teardown
+        @engine.stop
+    end
+
     def ac
         return @engine.application_context
     end
@@ -35,6 +37,21 @@ class FilePersistenceTest < Test::Unit::TestCase
         fe = SequenceExpression.new(fei, nil, nil, nil, nil)
         test_persistence(fes,fe)
     end
+
+    def test_path_splitting
+
+        fei = new_fei
+        fes = YamlFileExpressionStorage.new("yaml", ac)
+        class << fes
+            public :compute_file_path
+        end
+        path = fes.compute_file_path fei
+        a = fes.class.split_file_path path
+
+        assert_equal a[0], fei.wfid
+        assert_equal a[1], fei.expression_id
+        assert_equal a[2], fei.expression_name
+    end
     
     #
     # test UTF-8 data persistence

data/test/ft_0c_testname.rb

@@ -20,10 +20,13 @@ class TestTestName < Test::Unit::TestCase
     #end
 
     def test_name_of_test
-        dotest(\
-"""<process-definition name='#{name_of_test}' revision='0'>
+        dotest(
+            """
+<process-definition name='#{name_of_test}' revision='0'>
     <print>#{name_of_test}</print>
-</process-definition>""", "name_of_test")
+</process-definition>
+            """.strip, 
+            "name_of_test")
     end
 
 end

data/test/ft_26_load.rb

@@ -27,15 +27,16 @@ class FlowTest26 < Test::Unit::TestCase
     #
 
     class TestDefinition0 < ProcessDefinition
-        def make
-            process_definition :name => "test0", :revision => "0" do
-                sequence do
-                    count
-                    count
-                end
+        process_definition :name => "test0", :revision => "0" do
+            sequence do
+                count
+                count
             end
         end
     end
+    #class TestDefinition0 < ProcessDefinition
+    #    count
+    #end
 
     #def xxxx_load_0
     def test_load_0
@@ -52,7 +53,7 @@ class FlowTest26 < Test::Unit::TestCase
             map[workitem.flow_id] = count
         end
 
-        n = 100
+        n = 1000
 
         n.times do |i|
             li = LaunchItem.new(TestDefinition0)
@@ -60,11 +61,17 @@ class FlowTest26 < Test::Unit::TestCase
             @engine.launch(li)
         end
 
+        #while @engine.get_expression_storage.size > 1
+        #    sleep 0.001
+        #end
+        @engine.join_until_idle
+
         good = true
 
         n.times do |i|
             c = map[i]
             if c == 2
+            #if c == 1
                 print "."
             else
                 print c

data/test/ft_26b_load.rb

@@ -0,0 +1,87 @@
+
+#
+# Testing OpenWFE
+#
+# John Mettraux at openwfe.org
+#
+# Tue Jan  2 13:14:37 JST 2007
+#
+
+#require 'profile'
+
+require 'flowtestbase'
+require 'openwfe/expressions/raw_prog'
+
+include OpenWFE
+
+
+class FlowTest26b < Test::Unit::TestCase
+    include FlowTestBase
+
+    #def setup
+    #end
+
+    #def teardown
+    #end
+
+    #
+    # Test 0
+    #
+
+    class TestDefinition0 < ProcessDefinition
+        count
+    end
+
+    #def xxxx_load_0
+    def test_load_0
+
+        #require 'openwfe/expool/journal'
+        #@engine.application_context[:keep_journals] = true
+        #@engine.init_service("journal", Journal)
+
+        $count = 0
+
+        @engine.register_participant("count") do |workitem|
+            $count += 1
+            #puts "count is #{$count}"
+        end
+        
+
+        n = 1000
+        n.times do |i|
+            @engine.launch(LaunchItem.new(TestDefinition0))
+            
+        end
+        
+        puts "launched #{n} items"
+
+        #n.times do |i|
+        #    Thread.new do
+        #        @engine.launch(LaunchItem.new(TestDefinition0))
+        #    end
+        #end
+
+        #5.times do 
+        #    Thread.new do
+        #        (n / 5).times do
+        #            @engine.launch(LaunchItem.new(TestDefinition0))
+        #        end
+        #    end
+        #end
+        #sleep 1
+
+        join_until_idle
+
+        assert_equal $count, n
+    end
+    
+    def join_until_idle ()
+      storage = @engine.get_expression_storage
+      while storage.size > 1
+        sleep 1
+        puts "storage.size:#{storage.size}"
+      end
+    end
+
+end
+

data/test/ft_26c_load.rb

@@ -0,0 +1,71 @@
+
+#
+# Testing OpenWFE
+#
+# John Mettraux at openwfe.org
+#
+# Tue Jan  2 13:14:37 JST 2007
+#
+
+#require 'profile'
+
+require 'flowtestbase'
+require 'openwfe/expressions/raw_prog'
+
+include OpenWFE
+
+
+class FlowTest26c < Test::Unit::TestCase
+    include FlowTestBase
+
+    #def setup
+    #end
+
+    #def teardown
+    #end
+
+    #
+    # Test 0
+    #
+
+    N = 10000
+
+    class TestDefinition0 < ProcessDefinition
+        sequence do
+            N.times do
+                count
+            end
+        end
+    end
+
+    #def xxxx_load_0
+    def test_load_0
+
+        #require 'openwfe/expool/journal'
+        #@engine.application_context[:keep_journals] = true
+        #@engine.init_service("journal", Journal)
+            #
+            # very heavy
+
+        #require 'openwfe/expool/errorjournal'
+        #@engine.init_service("journal", ErrorJournal)
+            #
+            # light, almost inexistent (when there are no errors)
+
+        $count = 0
+
+        @engine.register_participant("count") do |workitem|
+            $count += 1
+            #print "."
+        end
+
+        fei = @engine.launch(LaunchItem.new(TestDefinition0))
+        puts "launched #{fei}"
+
+        @engine.wait_for fei
+
+        assert_equal $count, N
+    end
+
+end
+

data/test/ft_27_getflowpos.rb

@@ -45,12 +45,30 @@ class FlowTest27 < Test::Unit::TestCase
 
         sleep 0.500
 
-        l = @engine.get_expression_pool.get_flow_position(fei.wfid)
+        l = @engine.get_process_stack(fei.wfid)
 
         #print_exp_list(l)
 
         assert_equal \
-            l.size, 3, "get_flow_position() returned #{l.size} elements"
+            l.size, 3, "get_process_stack() returned #{l.size} elements"
+
+        ps = @engine.get_process_status
+        #puts
+        #puts ps[fei.parent_wfid].to_s
+        #puts
+
+        assert_equal ps[fei.parent_wfid].errors.size, 0
+        assert_equal ps[fei.parent_wfid].expressions.size, 1
+        assert_kind_of ParticipantExpression, ps[fei.parent_wfid].expressions[0]
+
+        ps = @engine.get_process_status fei.wfid[0, 4]
+
+        assert_equal ps[fei.parent_wfid].errors.size, 0
+        assert_equal ps[fei.parent_wfid].expressions.size, 1
+        assert_kind_of ParticipantExpression, ps[fei.parent_wfid].expressions[0]
+
+        #
+        # resume process
 
         wi = sp.first_workitem
 
@@ -81,7 +99,8 @@ class FlowTest27 < Test::Unit::TestCase
 
         sleep 0.500
 
-        l = @engine.get_flow_position(fei.wfid)
+        #l = @engine.get_process_stack(fei.wfid)
+        l = @engine.get_process_stack(fei)
             #
             # shortcut version
 

data/test/ft_34_cancelwfid.rb

@@ -62,8 +62,9 @@ class FlowTest34 < Test::Unit::TestCase
 
         @engine.cancel_process(fei.wfid)
 
-        #l = @engine.list_processes()
-        #assert_equal l.size, 0
+        sleep 0.500
+
+        assert_equal @engine.get_process_stack(fei.wfid).size, 0
 
         assert_equal sp.size, 0
             # check that participant got cancelled as well

data/test/ft_42_environments.rb

@@ -43,7 +43,7 @@ class FlowTest42 < Test::Unit::TestCase
     def test_0
         dotest(
             TestCase42a0, 
-            "v:c")
+            [ "v:b", "v:c" ])
     end
 
 
@@ -51,6 +51,8 @@ class FlowTest42 < Test::Unit::TestCase
     # Test 1
     #
 
+    # DISABLED
+
     class TestCase42a1 < ProcessDefinition
         sequence do
             set :variable => "v", :value => "a"