weel 1.99.85 → 1.99.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7f206a93ca278638856f8ab6b78fda00f60d3f4ef7edd4de39f3cbd815033f
-  data.tar.gz: 3d4aca5885e568a369da106911af21203f452168d94df137f5c7c28756314cae
+  metadata.gz: 382652394caca0a926ca5dd00d5c9582042d8ca33bddbcc339e0db3132e6814b
+  data.tar.gz: 1f3b40aef98c19c0da0bc65fbd8019e730f25ad9628c9d0b75fdcb84a3f92660
 SHA512:
-  metadata.gz: fdef4e6efd51ca5e02802ccf7ec18a2d6e0c1170235c2ed4daf2ef42d04b4890f17cc222b0721abf210a169a7bfb2458ee95ab5f4776c33c896957c93de2c725
-  data.tar.gz: 94d63a774749ff47717a4d6d18c8f0b79a026f702a3d0640193a3d80d47a08c558603b2e4359ebd200fa084708e1a84da16d594c817b054dd346243d09195807
+  metadata.gz: fd87fada9619e4c8816851df18d61c560e10f608944c8fdaf4cc69d4afa4fb549a647143865052dac70f7bd1ff3b8744d1168c57cec1b14995826442de177f11
+  data.tar.gz: a992e55a9561d6003a60812e022cedfed1b9ebb21c549a19758d45c99ce95931b515914f401d4f9c104d9aff158e4e49c856b4f522b676e0b626aba9d15d577f

data/lib/weel.rb

@@ -15,6 +15,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'thread'
+require 'securerandom'
 
 class WEEL
   def initialize(*args)# {{{
@@ -237,6 +238,7 @@ class WEEL
   end # }}}
 
   class HandlerWrapperBase # {{{
+    def self::loop_guard(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
@@ -288,7 +290,7 @@ class WEEL
     end
     def as_json(*)
       jsn = { 'position' => @position }
-      jsn['passtrough'] = @passthrough if @passthrough
+      jsn['passthrough'] = @passthrough if @passthrough
       jsn
     end
     def to_s
@@ -297,6 +299,12 @@ class WEEL
     def to_json(*args)
       as_json.to_json(*args)
     end
+    def eql?(other)
+      to_s == other.to_s
+    end
+    def hash
+      to_s.hash
+    end
   end # }}}
 
    class Continue # {{{
@@ -584,15 +592,21 @@ class WEEL
         __weel_sim_stop(:loop,hw,pos,args.merge(:testing=>condition[1],:condition=>cond))
         return
       end
+      loop_guard = 0
+      loop_id = SecureRandom.uuid
       catch :escape do
         case condition[1]
           when :pre_test
             while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
+              loop_guard += 1
               __weel_protect_yield(&block)
+              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
             end
           when :post_test
             begin
+              loop_guard += 1
               __weel_protect_yield(&block)
+              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
             end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
         end
       end
@@ -622,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 #}}}
 
@@ -667,26 +681,36 @@ class WEEL
       end
     end #}}}
 
-    def __weel_progress(searchmode, position, skip=false) #{{{
+    def __weel_progress(position, skip=false) #{{{
       ipc = {}
-      if searchmode == :after
-        wp = WEEL::Position.new(position, :after, nil)
-        ipc[:after] = [wp]
+      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] ||= []
+        ipc[:unmark] << Thread.current[:branch_parent][:branch_position] rescue nil
+        Thread.current[:branch_parent][:branch_position] = nil
+      end
+      if Thread.current[:branch_position]
+        @__weel_positions.delete Thread.current[:branch_position]
+        ipc[:unmark] ||= []
+        ipc[:unmark] << Thread.current[:branch_position] rescue nil
+      end
+      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
-        if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
-          @__weel_positions.delete Thread.current[:branch_parent][:branch_position]
-          ipc[:unmark] ||= []
-          ipc[:unmark] << Thread.current[:branch_parent][:branch_position] rescue nil
-          Thread.current[:branch_parent][:branch_position] = nil
-        end
-        if Thread.current[:branch_position]
-          @__weel_positions.delete Thread.current[:branch_position]
-          ipc[:unmark] ||= []
-          ipc[:unmark] << Thread.current[:branch_position] rescue nil
-        end
-        wp = WEEL::Position.new(position, skip ? :after : :at, nil)
-        ipc[skip ? :after : :at] = [wp]
+        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! if ipc[:unmark]
+
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
 
@@ -709,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
@@ -755,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]
@@ -780,7 +798,7 @@ class WEEL
                   if self.__weel_state == :stopping || self.__weel_state == :finishing
                     handlerwrapper.activity_stop
                     wp.passthrough = handlerwrapper.activity_passthrough_value
-                    raise Signal::Proceed
+                    raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
                   end
 
                   code = if waitingresult == WEEL::Signal::Again
@@ -906,11 +924,13 @@ 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 ? :after : false
+        @__weel_search_positions[position].detail == :after
       else
         branch[:branch_search] = true
       end

data/weel.gemspec

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