weel 1.99.116 → 1.99.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4179daff04f9e6d8e955eeec5538cd100673aeb2941c8445a88639d321f828b2
-  data.tar.gz: 5fe7cde1bf8ab2bed9e6a0a6a71e9ee19910a118e9ea00bbd99efcd88ffcf40f
+  metadata.gz: b5bc42f10a93d8960c022e4b48fe7eaeee25912bb7b9245b2ed4fd20159ed89f
+  data.tar.gz: c55e8d55c288a759a10eee35dfb84d93e414c9e534c8a9c1df47b5ad03a58d3f
 SHA512:
-  metadata.gz: 95bda8281dd834bc7d2f1dcb63b135f162b4ddf45847c22de8835d091fc2d920ec7a6104849be59447b379d22bbd71e230610cbe22f751cc6a50a0ebb7d5008e
-  data.tar.gz: 9b06b7677afe6f1449c6fd8dfcd64de06607d36d659e80c9c8a016652a0cfac66533ee760245fa39e1b2726b50a83e000483fb9ed846a19744f758a2f225c4d1
+  metadata.gz: 4a67a6c207b00bb5e124391f41b83d6ad98d4c8de3e986c9376e1d78772e9ef157e4c642c5739b0b49daa29c108ebd903e3914a06344e12893bbad55ffedcc82
+  data.tar.gz: ef5ed955f4ce61abe1a4be7924a2faf66a9c296bb11e7cb1fcc3e5b8fce05b0246950bd8fea7f21f4c57c3ccb775928184b74c86b6cde9a4afe4d45cdc034926

data/lib/weel.rb

@@ -523,14 +523,12 @@ class WEEL
       cw.join_branches(Thread.current[:branch_traces])
 
       unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
-        # first set all to no_longer_neccessary
+        # first set all to no_longer_neccessary, just in case, but this should not be necessary
         Thread.current[:branches].each do |thread|
-          if thread.alive? && thread[:branch_wait_count_cancel_active] == false
-            thread[:nolongernecessary] = true
-            __weel_recursive_continue(thread)
-          end
+          thread[:nolongernecessary] = true
+          __weel_recursive_continue(thread)
         end
-        # wait for all
+        # wait for all, they should not even exist at this point
         Thread.current[:branches].each do |thread|
           __weel_recursive_join(thread)
         end
@@ -549,7 +547,7 @@ class WEEL
 
       branch_parent[:branches] << Thread.new(*vars) do |*local|
         Thread.current.abort_on_exception = true
-        Thread.current[:branch_status] = false
+        Thread.current[:branch_search] = @__weel_search_positions.any?
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
         Thread.current[:local] = local
@@ -584,10 +582,20 @@ class WEEL
         __weel_sim_stop(:parallel_branch,connectionwrapper,current_branch_sim_pos) if __weel_sim
 
         branch_parent[:mutex].synchronize do
-          Thread.current[:branch_status] = true
           branch_parent[:branch_finished_count] += 1
 
-          if branch_parent[:branch_finished_count] == branch_parent[:branch_wait_count] && self.__weel_state != :stopping && self.__weel_state != :finishing
+          if branch_parent[:branch_wait_count_cancel_condition] == :last
+            if branch_parent[:branch_finished_count] == branch_parent[:branch_wait_count] && self.__weel_state != :stopping && self.__weel_state != :finishing
+              branch_parent[:branches].each do |thread|
+                if thread.alive? && thread[:branch_wait_count_cancel_active] == false
+                  thread[:nolongernecessary] = true
+                  __weel_recursive_continue(thread)
+                end
+              end
+            end
+          end
+
+          if branch_parent[:branch_finished_count] == branch_parent[:branches].length && self.__weel_state != :stopping && self.__weel_state != :finishing
             branch_parent[:branch_event].continue
           end
         end
@@ -636,7 +644,9 @@ class WEEL
         end
         Thread.current[:alternative_executed][-1] = true if condition
       end
-      __weel_protect_yield(&block) if __weel_is_in_search_mode || __weel_sim || condition
+      searchmode = __weel_is_in_search_mode
+      __weel_protect_yield(&block) if searchmode || __weel_sim || condition
+      Thread.current[:alternative_executed][-1] = true if __weel_is_in_search_mode != searchmode # we swiched from searchmode true to false, thus branch has been executed which is as good as evaling the condition to true
       __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => ((condition.is_a?(String) || condition.is_a?(Proc)) ? condition : nil))) if __weel_sim
     end # }}}
     def otherwise(args={},&block) # {{{
@@ -824,9 +834,9 @@ class WEEL
 
     def __weel_activity(position, type, endpoint, parameters, finalize=nil, update=nil, prepare=nil, salvage=nil)# {{{
       position = __weel_position_test position
+      searchmode = __weel_is_in_search_mode(position)
+      return if searchmode == true
       begin
-        searchmode = __weel_is_in_search_mode(position)
-        return if searchmode == true
         return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
         Thread.current[:continue] = Continue.new
@@ -996,7 +1006,7 @@ class WEEL
                 Thread.current[:branch_wait_count_cancel_active] = true
                 Thread.current[:branch_parent][:branch_wait_count_cancel] += 1
               end
-              if Thread.current[:branch_parent][:branch_wait_count_cancel] ==  Thread.current[:branch_parent][:branch_wait_count]  && self.__weel_state != :stopping && self.__weel_state != :finishing
+              if Thread.current[:branch_parent][:branch_wait_count_cancel] == Thread.current[:branch_parent][:branch_wait_count]  && self.__weel_state != :stopping && self.__weel_state != :finishing
                 Thread.current[:branch_parent][:branches].each do |thread|
                   if thread.alive? && thread[:branch_wait_count_cancel_active] == false
                     thread[:nolongernecessary] = true
@@ -1057,9 +1067,10 @@ class WEEL
 
     def __weel_is_in_search_mode(position = nil)# {{{
       branch = Thread.current
-      return false if @__weel_search_positions.empty? || branch[:branch_search] == false
 
-      if position && @__weel_search_positions.include?(position) # matching searchpos => start execution from here
+      return false unless branch[:branch_search]
+
+      if position && branch[:branch_search] && @__weel_search_positions.include?(position) # matching searchpos => start execution from here
         branch[:branch_search] = false # execute all activities in THIS branch (thread) after this point
         branch[:branch_search_now] = true # just now did we switch the search mode
         while branch.key?(:branch_parent) # also all parent branches should execute activities after this point, additional branches spawned by parent branches should still be in search mode
@@ -1069,7 +1080,7 @@ class WEEL
         end
         @__weel_search_positions[position].detail == :after
       else
-        branch[:branch_search] = true
+        true
       end
     end # }}}
 
@@ -1252,6 +1263,7 @@ public
   def start # {{{
     return nil if @dslr.__weel_state != :ready && @dslr.__weel_state != :stopped
     @dslr.__weel_main = Thread.new do
+      Thread.current[:branch_search] = true if @dslr.__weel_search_positions.any?
       begin
         __weel_control_flow(:running)
       rescue => e

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.116"
+  s.version          = "1.99.118"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.116
+  version: 1.99.118
 platform: ruby
 authors:
 - Juergen eTM Mangler