weel 1.1.1 → 1.2.1

data/Changelog

@@ -1,3 +1,8 @@
+1.2.x
+-----
+
+Ruby >= 1.9.3 only, use Queue instead of Threads and Mutexes of Weel::Continue
+
 1.1.x
 -----
 Simulation support: #sim is like search mode but without search positions and

data/lib/weel.rb

@@ -194,19 +194,19 @@ class WEEL
 
    class Continue #{{{
      def initialize
-       @thread = Thread.new{Thread.stop}
+       @q = Queue.new
+       @m = Mutex.new
      end  
      def waiting?
-       @thread.alive?
+       @m.synchronize do
+         !@q.empty?
+       end  
      end  
      def continue
-       while @thread.status != 'sleep' && @thread.alive?
-         Thread.pass
-       end
-       @thread.wakeup if @thread.alive? 
+       @q.push nil
      end
      def wait
-       @thread.join
+       @q.deq
      end
    end #}}}
 
@@ -525,9 +525,9 @@ class WEEL
       Thread.current[:alternative_mode] ||= []
       Thread.current[:alternative_executed] << false
       Thread.current[:alternative_mode] << mode
-      hw, pos = __weel_sim_start(:choose,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      hw, pos = __weel_sim_start(:choose,:mode => Thread.current[:alternative_mode].last) if __weel_sim
       yield
-      __weel_sim_stop(:choose,hw,pos,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      __weel_sim_stop(:choose,hw,pos,:mode => Thread.current[:alternative_mode].last) if __weel_sim
       Thread.current[:alternative_executed].pop
       Thread.current[:alternative_mode].pop
       nil
@@ -620,15 +620,12 @@ class WEEL
     end  # }}}
     def __weel_recursive_continue(thread)# {{{
       return unless thread
-      if thread.alive? && thread[:continue] && thread[:continue].waiting?
+      if thread.alive? && thread[:continue]
         thread[:continue].continue
       end
-      if thread.alive? && thread[:branch_event] && thread[:branch_event].waiting?
+      if thread.alive? && thread[:branch_event]
         thread[:mutex].synchronize do
-          unless thread[:branch_event].nil?
-            thread[:branch_event].continue
-            # thread[:branch_event] = nil
-          end  
+          thread[:branch_event].continue unless thread[:branch_event].nil?
         end  
       end  
       if thread[:branches]

data/test/SimHandlerWrapper.rb

@@ -51,6 +51,50 @@ class Trace #{{{
     nil
   end
 
+  def generate_list
+    pp self
+    pp recursive_generate_list(self,:otherwise=>false)
+  end
+
+  def recursive_generate_list(container,options)
+    traces = [[]]
+    container.each do |ele|
+      case ele
+        when TraceActivity
+          traces.last << ele.tid
+        when TraceChoose
+          options[:otherwise] = true
+          tmp = recursive_generate_list(ele,options)
+          options[:otherwise] = false
+          add_traces(traces,tmp)
+
+          #tmp = recursive_generate_list(ele,options)
+        when TraceAlternative
+          next if options[:otherwise]
+          tmp = recursive_generate_list(ele,options)
+          add_traces(traces,tmp)
+        when TraceOtherwise
+          next unless options[:otherwise]
+          options[:otherwise] = false
+          tmp = recursive_generate_list(ele,options)
+          p tmp
+          p '---'
+          add_traces(traces,tmp)
+          options[:otherwise] = true
+      end  
+    end
+    traces
+  end
+
+  def add_traces(before,newones)
+    before.each do |trc|
+      newones.each do |no|
+        p trc
+        trc += no
+      end
+    end
+  end
+
   private :recursive_get_container
 end #}}}
 
@@ -74,7 +118,7 @@ class TraceContainer < TraceBase #{{{
   def close!; @open = false; end
 end #}}}
 
-class TraceElement < TraceBase #{{{
+class TraceActivity < TraceBase #{{{
   attr_accessor :item
   def initialize(tid, item)
     super tid
@@ -107,8 +151,6 @@ class PlainTrace
   end  
 end
 
-$trace = Trace.new
-
 class SimHandlerWrapper < WEEL::HandlerWrapperBase
   def initialize(args,endpoint=nil,position=nil,continue=nil)
     @__myhandler_stopped = false
@@ -119,11 +161,11 @@ class SimHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def simulate(type,nesting,tid,parent,parameters={})
-    pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
+    # pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
 
     case type
       when :activity
-        $trace.get_container(parent) << TraceElement.new(tid,parameters[:endpoint])
+        $trace.get_container(parent) << TraceActivity.new(tid,parameters[:endpoint])
       when :parallel
         simulate_add_to_container($trace,nesting,parent,tid) { TraceParallel.new(tid) }
       when :loop

data/test/basic/tc_parallel.rb

@@ -68,6 +68,7 @@ class TestParallel < Test::Unit::TestCase
       parallel :wait => 1 do
         parallel_branch do
           activity :a_1, :call, :endpoint1
+          Thread.pass
         end
         parallel_branch do
           activity :a_2, :call, :endpoint1, :call =>  Proc.new{ sleep 0.5 }

data/test/basic/tc_state.rb

@@ -4,11 +4,11 @@ require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
 class TestState < Test::Unit::TestCase
   include TestMixin
 
-  def test_check_state
-    s = @wf.state
-    assert(s.is_a?(Symbol), "state is not a symbol")
-    assert(s == :ready, "state is not set to :ready, it is #{s}")
-  end
+  #def test_check_state
+  #  s = @wf.state
+  #  assert(s.is_a?(Symbol), "state is not a symbol")
+  #  assert(s == :ready, "state is not set to :ready, it is #{s}")
+  #end
   def test_check_stop_state
     @wf.start
     @wf.stop.join

data/test/wfp_adv_branching/tc_structured_discriminator.rb

@@ -10,6 +10,7 @@ class TestWFPStructuredDiscriminator < Test::Unit::TestCase
       parallel :wait => 1 do
         parallel_branch do
           activity :a_1_1, :call, :endpoint1
+          Thread.pass
         end
         parallel_branch do
           activity :a_1_2, :call, :endpoint1, :call => Proc.new{sleep 0.2}

data/test/wfp_state_based/tc_deferredchoice.rb

@@ -12,6 +12,7 @@ class TestWFPDeferredChoice < Test::Unit::TestCase
           activity :a1_1, :call, :endpoint1 do
             data.choice = 1
           end
+          Thread.pass
         end
         parallel_branch do
           activity(:a1_2, :call, :endpoint1, :call => Proc.new{sleep 1.0}) do
@@ -30,8 +31,9 @@ class TestWFPDeferredChoice < Test::Unit::TestCase
     end
     @wf.start.join
     wf_assert('CALL a1_1')
-    wf_assert('CALL a1_2')
-    wf_sassert('Da1_1NLNa1_2Ca2_1Da2_1|finished|')
+    wf_assert('DONE a1_1')
+    wf_assert('MANIPULATE a1_1')
+    wf_sassert('NLNa1_2Ca2_1Da2_1|finished|')
     data = @wf.data
     assert(data[:choice] == 1, "data[:choice] has not the correct value [#{data[:x]}]")
   end

data/weel.gemspec

@@ -1,18 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.1.1"
+  s.version          = "1.2.1"
   s.platform         = Gem::Platform::RUBY
-  s.summary          = "preliminary release of the Workflow Execution Engine Library (WEEL)"
+  s.license          = "LGPL-2"
+  s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"
 
-  s.description = <<-EOF
-For WEE Library specific information see http://cpee.org/.
+  s.description      = "Workflow Execution Engine Library (WEEL)"
 
-Copyright (C) 2008-2013 Jürgen Mangler <juergen.mangler@gmail.com> and others.
-
-WEE Library is freely distributable according to the terms of the GNU Lesser General Public License (see the file 'COPYING').
-
-This program is distributed without any warranty. See the file 'COPYING' for details.
-EOF
+  s.required_ruby_version = '>=1.9.3'
 
   s.files            = Dir['{example/**/*,lib/weel.rb}'] + %w(COPYING Changelog FEATURES INSTALL Rakefile weel.gemspec README AUTHORS)
   s.require_path     = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,21 +10,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies: []
-description: ! 'For WEE Library specific information see http://cpee.org/.
-
-
-  Copyright (C) 2008-2013 Jürgen Mangler <juergen.mangler@gmail.com> and others.
-
-
-  WEE Library is freely distributable according to the terms of the GNU Lesser General
-  Public License (see the file ''COPYING'').
-
-
-  This program is distributed without any warranty. See the file ''COPYING'' for details.
-
-'
+description: Workflow Execution Engine Library (WEEL)
 email: juergen.mangler@gmail.com
 executables: []
 extensions: []
@@ -46,36 +34,37 @@ files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestMixin.rb
 - test/TestWorkflow.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/TestMixin.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_sequence.rb
 - test/wfp_state_based/tc_deferredchoice.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_multimerge.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_wf_control.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_parallel.rb
 - test/basic/tc_codereplace.rb
 - test/basic/tc_data.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_parallel.rb
 - test/basic/tc_search.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_choose.rb
 - test/basic/tc_state.rb
-- test/complex/tc_parallel_stop.rb
+- test/basic/tc_handler.rb
+- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
+- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/complex/tc_parallel_stop.rb
 homepage: http://cpee.org
-licenses: []
+licenses:
+- LGPL-2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -85,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,39 +83,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: preliminary release of the Workflow Execution Engine Library (WEEL)
+summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
 - test/SimHandlerWrapper.rb
 - test/TestHandlerWrapper.rb
 - test/ContinueTest.rb
-- test/TestMixin.rb
 - test/TestWorkflow.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/TestMixin.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_sequence.rb
 - test/wfp_state_based/tc_deferredchoice.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
 - test/wfp_iteration/tc_structuredloop.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_multimerge.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_wf_control.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_parallel.rb
 - test/basic/tc_codereplace.rb
 - test/basic/tc_data.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_parallel.rb
 - test/basic/tc_search.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_choose.rb
 - test/basic/tc_state.rb
-- test/complex/tc_parallel_stop.rb
+- test/basic/tc_handler.rb
+- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
+- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/complex/tc_parallel_stop.rb