weel 1.99.147 → 1.99.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69f09565a0379192ad8313bef74a41fa04c5b088f8d8422aa2f74608e9ff7f8e
-  data.tar.gz: 7981eaa92f35eb497354db544616596daff1d31343abd87a2ea313d5db33e6ad
+  metadata.gz: e10889ede3a7592b78507a3c2407de7b1ab973e53018daaf383cd9ac6e647a10
+  data.tar.gz: 183c98ada1407aebad8784f2be27c3fab044a4ee9c7946f0f425fa04ee6cee38
 SHA512:
-  metadata.gz: 015f753c35aab1d566cf8e8d4225776380f5ac52038e1f5cc77affebb30202c4d121bdd5b64e987ee78672f8e5aeb85b74ca36328f96ec8e1db8658797f41412
-  data.tar.gz: 5c91f64464d1b0dd98a8725017f5eba90319f042c6bcfe73b5fa8711e728d00163e458e72cb80ccba1dc6dd1ed48b450b4cf387e0215984522470dd3c4def355
+  metadata.gz: 182e697164ae732c2f75c511a3663dc7a5132edc4788348231f3d5beaf3ce758f69a1f112f4495df4e80a39fbe5ed6a94657f69f53e1627da8154a5559d1162a
+  data.tar.gz: '08dbadddd9c6bf1875fe9d9b423e627846a185b5bd3dcb66479f4d32fda3f9daccb4b1e1a02d3e73933a5399811723d2dfab1b56d4c15dfdc3e65eb867601972'

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 # {{{
@@ -519,7 +519,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 +540,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 +553,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 +569,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 +631,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 +645,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 +657,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 +671,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 +709,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 +724,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 +746,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 +756,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,12 +771,12 @@ 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) #{{{
       return if __weel_is_in_search_mode
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       self.__weel_state = :finishing
@@ -816,10 +816,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)

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.147"
+  s.version          = "1.99.148"
   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.148
 platform: ruby
 authors:
 - Juergen eTM Mangler