weel 1.99.90 → 1.99.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75c73b084f3926403dc8938f27a1295d7a36d7ccd2299f5eff2af075808da24
-  data.tar.gz: d3d5d52b613217a031392c740442bbe6a6d16d64b38b668dca8d15035a86a078
+  metadata.gz: 641444781be26b938868f6115466c81870c175948bd664a4b8f4abe2ffd8f4ab
+  data.tar.gz: eee050aca5dcb0a5002cbd7b5eb6274d6dc0ed33b50ef89c634b8d4754c2ef43
 SHA512:
-  metadata.gz: 710def978b14664c463ea6e87bb88179b2cc2aa01429fa908142b202b75e2ea8831eacd663573252ec5ff9e0dd54e534b965c5033dc68dc675aa3fe7543a32ca
-  data.tar.gz: 34d4be7d47e4c2ffd243fb1d216c98387de56058dc20bb827085d56dc3e3f08899f1b7bd9ee9d67d39e418ce2b0907f4ccf901ef0484f6d2940d2565bc5ba285
+  metadata.gz: '029b33aa91638408cf9994fccb389fda6e0660f02e81fad6bcb2fe2901c6d316e72a3dd2ef9dd6d2ba3ffbff627c8f17820b50db6c27b0a5c16c7860f96ab14e'
+  data.tar.gz: a760a8b4665d0587dde85638c680d0277b95de0e0c4a829dab502dcffa0f9f1241d553a942659594b4b825a56c5388679a04ee16f0098ffd82bc490993a07d7b

data/lib/weel.rb

@@ -238,7 +238,7 @@ class WEEL
   end # }}}
 
   class HandlerWrapperBase # {{{
-    def self::loop_guard(lid,count); false; end
+    def self::loop_guard(arguments,lid,count); false; end
     def self::inform_state_change(arguments,newstate); end
     def self::inform_syntax_error(arguments,err,code); end
     def self::inform_handlerwrapper_error(arguments,err); end
@@ -636,7 +636,7 @@ class WEEL
       searchmode = __weel_is_in_search_mode(position)
       return if searchmode
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
-      __weel_progress searchmode, position, true
+      __weel_progress position, true
       self.__weel_state = :stopping
     end #}}}
 
@@ -681,8 +681,9 @@ class WEEL
       end
     end #}}}
 
-    def __weel_progress(searchmode, position, skip=false) #{{{
+    def __weel_progress(position, skip=false) #{{{
       ipc = {}
+      branch = Thread.current
       if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
         @__weel_positions.delete Thread.current[:branch_parent][:branch_position]
         ipc[:unmark] ||= []
@@ -694,15 +695,21 @@ class WEEL
         ipc[:unmark] ||= []
         ipc[:unmark] << Thread.current[:branch_position] rescue nil
       end
-      wp = WEEL::Position.new(position, skip ? :after : :at, nil)
+      wp = if branch[:branch_search_now] == true
+        branch[:branch_search_now] = false
+        WEEL::Position.new(position, skip ? :after : :at, @__weel_search_positions[position]&.passthrough)
+      else
+        WEEL::Position.new(position, skip ? :after : :at)
+      end
       ipc[skip ? :after : :at] = [wp]
 
+      @__weel_search_positions.delete(position)
       @__weel_search_positions.each do |k,ele| # some may still be in active search but lets unmark them for good measure
         ipc[:unmark] ||= []
         ipc[:unmark] << ele
         true
       end
-      ipc[:unmark].uniq!
+      ipc[:unmark].uniq! if ipc[:unmark]
 
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
@@ -726,7 +733,7 @@ class WEEL
           return
         end
 
-        wp = __weel_progress searchmode, position
+        wp = __weel_progress position
 
         # searchmode position is after, jump directly to vote_sync_after
         raise Signal::Proceed if searchmode == :after
@@ -772,13 +779,7 @@ class WEEL
                 raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
                 raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
-                if @__weel_search_positions[position]
-                  passthrough = @__weel_search_positions[position].passthrough
-                  @__weel_search_positions[position].passthrough = nil
-                else
-                  passthrough = nil
-                end
-                handlerwrapper.activity_handle passthrough, params
+                handlerwrapper.activity_handle wp.passthrough, params
                 wp.passthrough = handlerwrapper.activity_passthrough_value
                 unless wp.passthrough.nil?
                   @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :wait => [wp]
@@ -923,9 +924,11 @@ class WEEL
 
       if position && @__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
           branch = branch[:branch_parent]
           branch[:branch_search] = false
+          branch[:branch_search_now] = true # just now did we switch the search mode
         end
         @__weel_search_positions[position].detail == :after
       else
@@ -1101,8 +1104,12 @@ public
   # Stop the workflow execution
   def stop # {{{
     Thread.new do
-      @dslr.__weel_state = :stopping
-      @dslr.__weel_main.join if @dslr.__weel_main
+      if  @dslr.__weel_state == :running
+        @dslr.__weel_state = :stopping
+        @dslr.__weel_main.join if @dslr.__weel_main
+      elsif @dslr.__weel_state == :ready || dslr.__weel_state == :stopped
+        @dslr.__weel_state = :stopped
+      end
     end
   end # }}}
   # Start the workflow execution

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.90"
+  s.version          = "1.99.95"
   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.90
+  version: 1.99.95
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit