weel 1.99.102 → 1.99.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a13fce46d5710759c73bb36ca6899d31e4934d870e8b8106f4475886634a03a
-  data.tar.gz: af4a5310b405e55029932cc977fbf45015c02be18aff50668b39a23ebcf567f7
+  metadata.gz: 36eb4b85ca61d7f3581ed326a038ded4e7efcebfb07df13f5d449d3e4b60784f
+  data.tar.gz: 655750bd2f7ba16c7951eb0d93c111f06788193120a445478108d16d6a9a35ac
 SHA512:
-  metadata.gz: 34768aa9b9ec5c9d72d6e650ed59bdc8a37d5760532cebe63933739b6cff7bc0ff9ca1c3e322f6877821e6af14b2835793881a98c7d383083046e26847d5208b
-  data.tar.gz: 81601be8fe0a73df8a34d436d8530a2376bd93553c1df70c1a5a5bfc54e84faf2714063545616a26598cc8d3b7e3e92386cca09619f1241169e9ceed19a848ea
+  metadata.gz: 1e60b5ea0829d5507f61599a917473eaa51b4fe5fb7f786c377ee8005a2fcf6ae295875729c634588815e1ad76f0fb46058b332b5a0b55528b7030f6d911b7e5
+  data.tar.gz: ae3b62411608b8725e734900520e7a42d99559852d131f24609699b72cdbbfa6f2d845ddcfa17c4a03a9bf3ab906da8911c36c71cdf0d27d40189f40c85c84f9

data/lib/weel.rb

@@ -263,6 +263,48 @@ class WEEL
     end
   end # }}}
 
+  class ReadOnlyHash # {{{
+    def initialize(values,sim=false)
+      @__weel_values = values.transform_values do |v|
+        if Object.const_defined?(:XML) && XML.const_defined?(:Smart) && v.is_a?(XML::Smart::Dom)
+          v.root.to_doc
+        else
+          begin
+            Marshal.load(Marshal.dump(v))
+          rescue
+            v.to_s rescue nil
+          end
+        end
+      end
+      @__weel_sim = sim
+    end
+
+    def to_json(*args)
+      @__weel_values.to_json(*args)
+    end
+
+    def method_missing(name,*args)
+      if @__weel_sim
+        "➤#{name}"
+      else
+        if args.empty? && @__weel_values.key?(name)
+          @__weel_values[name]
+        elsif args.empty? && @__weel_values.key?(name.to_s)
+          @__weel_values[name.to_s]
+        elsif name.to_s[-1..-1] == "=" && args.length == 1
+          temp = name.to_s[0..-2]
+          @__weel_values[temp.to_sym] = args[0]
+        elsif name.to_s == "[]=" && args.length == 2
+          @__weel_values[args[0]] = args[1]
+        elsif name.to_s == "[]" && args.length == 1
+          @__weel_values[args[0]]
+        else
+          nil
+        end
+      end
+    end
+  end # }}}
+
   class ConnectionWrapperBase # {{{
     def self::loop_guard(arguments,lid,count); false; end
     def self::inform_state_change(arguments,newstate); end
@@ -304,7 +346,8 @@ class WEEL
     def mem_guard; end
 
     def test_condition(mr,code); mr.instance_eval(code); end
-    def manipulate(mr,code,result=nil,options=nil); mr.instance_eval(code); end
+    def join_branches(branches); end
+    def manipulate(mr,code,where,result=nil,options=nil); mr.instance_eval(code,where,1); end
   end  # }}}
 
   class Position # {{{
@@ -437,6 +480,8 @@ class WEEL
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
 
       Thread.current[:branches] = []
+      Thread.current[:branch_traces] = {}
+      Thread.current[:branch_traces_ids] = 0
       Thread.current[:branch_finished_count] = 0
       Thread.current[:branch_event] = Continue.new
       Thread.current[:mutex] = Mutex.new
@@ -465,6 +510,9 @@ class WEEL
 
       __weel_sim_stop(:parallel,hw,pos) if __weel_sim
 
+      cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+      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
         Thread.current[:branches].each do |thread|
@@ -496,6 +544,10 @@ class WEEL
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
         Thread.current[:branch_wait_count_cancel_active] = false
+        branch_parent[:mutex].synchronize do
+          Thread.current[:branch_traces_id] = branch_parent[:branch_traces_ids]
+          branch_parent[:branch_traces_ids] += 1
+        end
 
         if __weel_sim
           Thread.current[:branch_sim_pos] = @__weel_sim += 1
@@ -668,6 +720,13 @@ 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]
+
+      # gather traces in threads to point to join
+      if Thread.current[:branch_parent] && Thread.current[:branch_traces_id]
+        Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] ||= []
+        Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] << position
+      end
+
       __weel_progress position, true
       self.__weel_state = :stopping
     end #}}}
@@ -676,7 +735,7 @@ class WEEL
       @__weel_status
     end # }}}
     def data # {{{
-      ReadHash.new(@__weel_data,__weel_sim)
+      ReadOnlyHash.new(@__weel_data,__weel_sim)
     end # }}}
     def endpoints # {{{
       ReadHash.new(@__weel_endpoints)
@@ -765,6 +824,12 @@ class WEEL
           return
         end
 
+        # gather traces in threads to point to join
+        if Thread.current[:branch_parent] && Thread.current[:branch_traces_id]
+          Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] ||= []
+          Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] << position
+        end
+
         wp = __weel_progress position
 
         # searchmode position is after, jump directly to vote_sync_after
@@ -783,7 +848,7 @@ class WEEL
                 mr.instance_eval(&finalize)
               elsif finalize.is_a?(String)
                 mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
-                connectionwrapper.manipulate(mr,finalize)
+                connectionwrapper.manipulate(mr,finalize,'Activity ' + position.to_s)
               end
               connectionwrapper.inform_manipulate_change(
                 ((mr && mr.changed_status) ? @__weel_status : nil),
@@ -805,7 +870,7 @@ class WEEL
                   if prepare.is_a?(Proc)
                     rs.instance_exec(&prepare)
                   elsif prepare.is_a?(String)
-                    rs.instance_eval prepare
+                    connectionwrapper.manipulate(rs,prepare,'Activity ' + position.to_s)
                   end
                 end
                 params = connectionwrapper.prepare(rs,endpoint,parameters,@__weel_replay)
@@ -857,7 +922,7 @@ class WEEL
                     elsif code.is_a?(String)
                       mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
                       ma = catch Signal::Again do
-                        connectionwrapper.manipulate(mr,code,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
+                        connectionwrapper.manipulate(mr,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
                         'yes' # ma sadly will have nil when i just throw
                       end
                     end

data/test/TestConnectionWrapper.rb

@@ -106,11 +106,4 @@ class TestConnectionWrapper < WEEL::ConnectionWrapperBase
     $short_track << "F#{@__myhandler_position}"
     raise(err)
   end #}}}
-
-  def manipulate(mr,code,result=nil,status=nil)
-    mr.instance_eval(code)
-  end
-  def test_condition(mr,code)
-    mr.instance_eval(code)
-  end
 end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.102"
+  s.version          = "1.99.105"
   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.102
+  version: 1.99.105
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)