weel 1.99.103 → 1.99.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc4118f9af75b1f635758821fc31af172b7f02151bc0a05902999123885754d
-  data.tar.gz: '09c0d3b3de4f1810ed59e4debc90a8f734fa3cdf634bd623eb79a75191ece2bf'
+  metadata.gz: 627e4761660de50801a488a4616023f2ec16339859d5542d92a7601d7e2178de
+  data.tar.gz: 30752f561acbf9aebc0592d92a1796918e5d50f879b26c2bee245965ce5dd72c
 SHA512:
-  metadata.gz: 0b0d10b86028537026755946a1dc5969ed5b9fb93b10a5a914f09f7cf3d2343f52d5f0875dc2caffa757eb62cdce0414511b0f90514ae6854b9a812583ebfa1d
-  data.tar.gz: a3754737a7bab106885e47cfe7968ee0ed2fbc8db637f08aad6ed35dba102cb71d171618da98e1cb99c35ab23adb430f2425aa7f99a0f74b83db4d677b6fe019
+  metadata.gz: 2874bf3236b00980121e9560cb7e6ee2d09bbc55b56732cc9dd5693165e74042d6bd2a135e67c285ef98c0bb154cd5e982d2e4129f7fb2fc1631b74ff61a8857
+  data.tar.gz: c44982e0661e397a673214955acd2e9e2647e878748ee394b8d37a1a2eba6bcab3785ef2693511424d1d72f670c7f35a331ab06a33f8a3fcd72210d3c87afa65

data/lib/weel.rb

@@ -43,7 +43,7 @@ class WEEL
   end # }}}
 
   class ReadStructure # {{{
-    def initialize(data,endpoints,additional)
+    def initialize(data,endpoints,local,additional)
       @__weel_data = data.transform_values do |v|
         if Object.const_defined?(:XML) && XML.const_defined?(:Smart) && v.is_a?(XML::Smart::Dom)
           v.root.to_doc
@@ -56,6 +56,7 @@ class WEEL
         end
       end
       @__weel_endpoints = endpoints.transform_values{ |v| v.dup }
+      @__weel_local = local
       @additional = additional
     end
 
@@ -91,14 +92,18 @@ class WEEL
     def endpoints
       ReadHash.new(@__weel_endpoints)
     end
+    def local
+      @__weel_local.first
+    end
   end # }}}
   class ManipulateStructure # {{{
-    def initialize(data,endpoints,status,additional)
+    def initialize(data,endpoints,status,local,additional)
       @__weel_data = data
       @__weel_data_orig = @__weel_data.transform_values{|val| Marshal.dump(val) } rescue nil
       @__weel_endpoints = endpoints
       @__weel_endpoints_orig = @__weel_endpoints.transform_values{|val| Marshal.dump(val) }
       @__weel_status = status
+      @__weel_local = local
       @changed_status = "#{status.id}-#{status.message}"
       @changed_data = []
       @touched_data = []
@@ -165,6 +170,9 @@ class WEEL
     def endpoints
       ManipulateHash.new(@__weel_endpoints,@touched_endpoints,@changed_endpoints)
     end
+    def local
+      @__weel_local.first
+    end
     def status
       @__weel_status
     end
@@ -263,6 +271,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,6 +354,7 @@ class WEEL
     def mem_guard; end
 
     def test_condition(mr,code); 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  # }}}
 
@@ -437,6 +488,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 +518,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|
@@ -495,7 +551,12 @@ class WEEL
         Thread.current[:branch_status] = false
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
+        Thread.current[:local] = local
         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 +729,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 +744,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)
@@ -700,7 +768,7 @@ class WEEL
     def __weel_eval_condition(condition) #{{{
       begin
         connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args unless condition.is_a?(Proc)
-        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,connectionwrapper.additional),condition)
+        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional),condition)
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
@@ -765,6 +833,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
@@ -779,10 +853,10 @@ class WEEL
               connectionwrapper.activity_manipulate_handle(parameters)
               connectionwrapper.inform_activity_manipulate
               if finalize.is_a?(Proc)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                 mr.instance_eval(&finalize)
               elsif finalize.is_a?(String)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                 connectionwrapper.manipulate(mr,finalize,'Activity ' + position.to_s)
               end
               connectionwrapper.inform_manipulate_change(
@@ -800,7 +874,7 @@ class WEEL
             begin
               again = catch Signal::Again do
                 connectionwrapper.mem_guard
-                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,connectionwrapper.additional)
+                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional)
                 if prepare
                   if prepare.is_a?(Proc)
                     rs.instance_exec(&prepare)
@@ -844,7 +918,7 @@ class WEEL
                   if code.is_a?(Proc) || code.is_a?(String)
                     connectionwrapper.inform_activity_manipulate
                     if code.is_a?(Proc)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                       ma = catch Signal::Again do
                         case code.arity
                           when 1; mr.instance_exec(connectionwrapper.activity_result_value,&code)
@@ -855,7 +929,7 @@ class WEEL
                         'yes' # ma sadly will have nil when i just throw
                       end
                     elsif code.is_a?(String)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                       ma = catch Signal::Again do
                         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

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.103"
+  s.version          = "1.99.106"
   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.103
+  version: 1.99.106
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-07 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)