weel 1.99.147 → 1.99.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69f09565a0379192ad8313bef74a41fa04c5b088f8d8422aa2f74608e9ff7f8e
-  data.tar.gz: 7981eaa92f35eb497354db544616596daff1d31343abd87a2ea313d5db33e6ad
+  metadata.gz: 75f93b76bf6a052ab4599ab858f7fe6af5ffcb694c09a4d37a334dbafe7f2382
+  data.tar.gz: 59c5301f495c1d6ab3ee162b7dfcdd62e1cffc8224b2215d0591668e67045af8
 SHA512:
-  metadata.gz: 015f753c35aab1d566cf8e8d4225776380f5ac52038e1f5cc77affebb30202c4d121bdd5b64e987ee78672f8e5aeb85b74ca36328f96ec8e1db8658797f41412
-  data.tar.gz: 5c91f64464d1b0dd98a8725017f5eba90319f042c6bcfe73b5fa8711e728d00163e458e72cb80ccba1dc6dd1ed48b450b4cf387e0215984522470dd3c4def355
+  metadata.gz: b67b945afbda1ea61fa806746768fe43d9dc92eb15749690cfb98a019e49d284a3edcce595d45d96f44569210c26f93a92023ed26bbbad9d0d7e893b053788de
+  data.tar.gz: eeebb997bbeb33b2304db64c84ca2e29a5dc478e70bbccdb3539eacc4e185fbd8f50addcc051285be41d17867730c44fa574338c93b49b72117013226f24b26c

data/lib/weel.rb

@@ -374,7 +374,7 @@ class WEEL
     def mem_guard; end
 
     def prepare(lock,dataelements,endpoints,status,local,additional,code,exec_endpoints,exec_parameters); end
-    def test_condition(dataelements,endpoints,local,additional,code,args={}); ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code); end
+    def test_condition(eid,dataelements,endpoints,local,additional,code,args={}); ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code); end
     def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
       lock.synchronize do
         if readonly
@@ -385,8 +385,8 @@ class WEEL
       end
     end
 
-    def join_branches(id,branches=[]); end
-    def split_branches(id,branches=[]); end
+    def join_branches(eid,branches=[]); end
+    def split_branches(eid,branches=[]); end
   end  # }}}
 
   class Position # {{{
@@ -490,11 +490,12 @@ class WEEL
       @__weel_connectionwrapper_args = []
       @__weel_state = :ready
       @__weel_status = Status.new(0,"undefined")
-      @__weel_sim = false
+      @__weel_abandon = false
       @__weel_lock = Mutex.new
     end #}}}
     attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_connectionwrapper, :__weel_connectionwrapper_args
     attr_reader :__weel_state, :__weel_status, :__weel_status
+    def __weel_abandon? = @__weel_abandon
 
     # DSL-Construct for translating expressions into static parameters
     def 🠊(code); ProcString.new(code); end
@@ -519,7 +520,7 @@ class WEEL
     # Parallel DSL-Construct
     # Defines Workflow paths that can be executed parallel.
     # May contain multiple branches (parallel_branch)
-    def parallel(type=nil,&block)# {{{
+    def parallel(eid,type=nil,&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
       Thread.current[:branches] = []
@@ -540,7 +541,7 @@ class WEEL
       end
 
       cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
-      cw.split_branches Thread.current.__id__, Thread.current[:branch_traces]
+      cw.split_branches eid, Thread.current[:branch_traces]
 
       Thread.current[:branches].each do |thread|
         # decide after executing block in parallel cause for coopis
@@ -553,7 +554,7 @@ class WEEL
 
       Thread.current[:branch_event].wait unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:branches].length == 0
 
-      cw.join_branches Thread.current.__id__, Thread.current[:branch_traces]
+      cw.join_branches eid, Thread.current[:branch_traces]
 
       unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
         # first set all to no_longer_neccessary, just in case, but this should not be necessary
@@ -569,7 +570,7 @@ class WEEL
     end # }}}
 
     # Defines a branch of a parallel-Construct
-    def parallel_branch(data=@__weel_data,&block)# {{
+    def parallel_branch(eid,data=@__weel_data,&block) #{{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       branch_parent = Thread.current
 
@@ -631,12 +632,12 @@ class WEEL
           end
         end
       end
-    end # }}}
+    end #}}}
 
     # Choose DSL-Construct
     # Defines a choice in the Workflow path.
     # May contain multiple execution alternatives
-    def choose(mode=:inclusive,&block) # {{{
+    def choose(eid,mode=:inclusive,&block) # {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       Thread.current[:alternative_executed] ||= []
       Thread.current[:alternative_mode] ||= []
@@ -645,9 +646,9 @@ class WEEL
 
       cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
 
-      cw.split_branches Thread.current.__id__
+      cw.split_branches eid
       __weel_protect_yield(&block)
-      cw.join_branches Thread.current.__id__
+      cw.join_branches eid
 
       Thread.current[:alternative_executed].pop
       Thread.current[:alternative_mode].pop
@@ -657,13 +658,13 @@ class WEEL
     # Defines a possible choice of a choose-Construct
     # Block is executed if condition == true or
     # searchmode is active (to find the starting position)
-    def alternative(condition,args={},&block)# {{{
+    def alternative(eid,condition,args={},&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       Thread.current[:mutex] ||= Mutex.new
       Thread.current[:mutex].synchronize do
         return if Thread.current[:alternative_mode][-1] == :exclusive && Thread.current[:alternative_executed][-1] == true
         if condition.is_a?(String)
-          condition = __weel_eval_condition(condition, args)
+          condition = __weel_eval_condition(eid, condition, args)
         end
         Thread.current[:alternative_executed][-1] = true if condition
       end
@@ -671,7 +672,7 @@ class WEEL
       __weel_protect_yield(&block) if searchmode || 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
     end # }}}
-    def otherwise(args={},&block) # {{{
+    def otherwise(eid,args={},&block) # {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       __weel_protect_yield(&block) if __weel_is_in_search_mode || !Thread.current[:alternative_executed].last
     end # }}}
@@ -709,7 +710,7 @@ class WEEL
     end #}}}
 
     # Defines a critical block (=Mutex)
-    def critical(id,&block)# {{{
+    def critical(eid,id,&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       @__weel_critical ||= Mutex.new
       semaphore = nil
@@ -724,7 +725,7 @@ class WEEL
     end # }}}
 
     # Defines a Cycle (loop/iteration)
-    def loop(condition,args={},&block)# {{{
+    def loop(eid,condition,args={},&block)# {{{
       unless condition[0].is_a?(String) && [:pre_test,:post_test].include?(condition[1]) && args.is_a?(Hash)
         raise "condition must be called pre_test{} or post_test{}"
       end
@@ -746,7 +747,7 @@ class WEEL
       catch :escape do
         case condition[1]
           when :pre_test
-            while __weel_eval_condition(condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
+            while __weel_eval_condition(eid, condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
               loop_guard += 1
               __weel_protect_yield(&block)
               sleep 1 if @__weel_connectionwrapper::loop_guard(@__weel_connectionwrapper_args,loop_id,loop_guard)
@@ -756,7 +757,7 @@ class WEEL
               loop_guard += 1
               __weel_protect_yield(&block)
               sleep 1 if @__weel_connectionwrapper::loop_guard(@__weel_connectionwrapper_args,loop_id,loop_guard)
-            end while __weel_eval_condition(condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
+            end while __weel_eval_condition(eid, condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
         end
       end
     end # }}}
@@ -771,14 +772,15 @@ class WEEL
       [code || blk, :post_test]
     end # }}}
 
-    def escape #{{{
+    def escape(eid) #{{{
       return if __weel_is_in_search_mode
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       throw :escape
     end #}}}
-    def terminate #{{{
+    def terminate(eid,abandon=false) #{{{
       return if __weel_is_in_search_mode
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
+      @__weel_abandon = abandon
       self.__weel_state = :finishing
     end #}}}
     def stop(position) #{{{
@@ -816,10 +818,10 @@ class WEEL
       end
     end #}}}
 
-    def __weel_eval_condition(condition,args={}) #{{{
+    def __weel_eval_condition(eid,condition,args={}) #{{{
       begin
         connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
-        connectionwrapper.test_condition(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,condition,args)
+        connectionwrapper.test_condition(eid,@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,condition,args)
       rescue NameError => err # don't look into it, or it will explode
         self.__weel_state = :stopping
         @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
@@ -1128,11 +1130,11 @@ class WEEL
       @__weel_positions = Array.new if newState == :running
       @__weel_state = newState
 
+      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
+
       if newState == :stopping || newState == :finishing
         __weel_recursive_continue(@__weel_main)
       end
-
-      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
     end # }}}
 
   end # }}}
@@ -1167,7 +1169,7 @@ public
     nil
   end #  }}}
 
-  # Get the state of execution (ready|running|stopping|stopped|finished|simulating|abandoned)
+  # Get the state of execution (ready|running|stopping|stopped|finished|abandoned)
   def state # {{{
     @dslr.__weel_state
   end #  }}}
@@ -1211,9 +1213,7 @@ public
           @dslr.__weel_positions.clear
           @dslr.__weel_connectionwrapper::inform_position_change(@dslr.__weel_connectionwrapper_args,ipc)
           @dslr.__weel_state = :finished
-        end
-        if @dslr.__weel_state == :simulating
-          @dslr.__weel_state = final_state
+          @dslr.__weel_state = :abandoned if @dslr.__weel_abandon?
         end
         if @dslr.__weel_state == :stopping
           @dslr.__weel_finalize
@@ -1286,13 +1286,4 @@ public
       end
     end
   end # }}}
-
-  def sim # {{{
-    stat = @dslr.__weel_state
-    return nil unless stat == :ready || stat == :stopped
-    @dslr.__weel_main = Thread.new do
-      __weel_control_flow :simulating, stat
-    end
-  end # }}}
-
 end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.147"
+  s.version          = "1.99.149"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   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.147
+  version: 1.99.149
 platform: ruby
 authors:
 - Juergen eTM Mangler