weel 1.99.93 → 1.99.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 192fe9f77deb35850f74cd72daa68722079328071cfa03ad084deb1150bba042
-  data.tar.gz: 1356643c63307940116767c3f5c9c530b5f8fb1815a6b6e50d643dba2da74bc5
+  metadata.gz: 9e82bd07a1a46e7456badf0f68f51b61ce8185c4292590e2c3113e3dcef9b23b
+  data.tar.gz: a8e5dc3301a874267a5742395816501d778c2b7ccd934590c55e28410c34994e
 SHA512:
-  metadata.gz: 670e85405505882e811166939c1b737e119f22df4df49ca2093475ff66d67404e7ce81f68231fe1b26fe0fedb5f2cdcd6663628ae619f9c721f063df8a0cf22d
-  data.tar.gz: b45751ee1561352c1de7e63fcb5695ad0b11706518b42c483f4f1cd94d51d962b4da9d3985ba8a6970c35d46d827ce7ceab3166af37822f3493b7b717932e33a
+  metadata.gz: 8b37432797796439fcff05c476d09f1c3f7ee388f01a83e593c9db8fcb7bc57f413f5809f0a48c31b2ba04f146928ec236a87e6e5e1ca78a487c7eccbfcb82a2
+  data.tar.gz: be8e00b7a57362406dfd61d9c84d53ad2451f7219c535c0a2e4562eedd527dba6ca50c32a735e8d898e959eeb6ac9e120ab9e6507f476dfebe9e96cbaa22d60f

data/lib/weel.rb

@@ -43,8 +43,7 @@ class WEEL
 
   class ReadStructure # {{{
     def initialize(data,endpoints,additional)
-      @__weel_data = data.dup
-      @__weel_data.transform_values! do |v|
+      @__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
         else
@@ -55,8 +54,7 @@ class WEEL
           end
         end
       end
-      @__weel_endpoints = endpoints.dup
-      @__weel_endpoints.transform_values!{ |v| v.dup }
+      @__weel_endpoints = endpoints.transform_values{ |v| v.dup }
       @additional = additional
     end
 
@@ -223,6 +221,8 @@ class WEEL
       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]
@@ -238,7 +238,7 @@ class WEEL
   end # }}}
 
   class HandlerWrapperBase # {{{
-    def self::loop_guard(lid,count); false; end
+    def self::loop_guard(arguments,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
@@ -275,6 +275,7 @@ class WEEL
     def simulate(type,nesting,sequence,parent,parameters={}); end
 
     def callback(result=nil,options={}); end
+    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
@@ -416,7 +417,9 @@ class WEEL
 
       __weel_protect_yield(&block)
 
-      Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type.size == 1 && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
+      Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
+      Thread.current[:branch_wait_count_cancel] = 0
+      Thread.current[:branch_wait_count_cancel_condition] = (type.is_a?(Hash) && type[:cancel] != nil && type[:cancel] == :first ) ? :first : :last
       1.upto Thread.current[:branches].size do
         Thread.current[:branch_event].wait
       end
@@ -459,11 +462,12 @@ class WEEL
         current_branch_sim_pos = branch_parent[:branch_sim_pos]
       end
 
-      Thread.current[:branches] << Thread.new(*vars) do |*local|
+      branch_parent[:branches] << Thread.new(*vars) do |*local|
         Thread.current.abort_on_exception = true
         Thread.current[:branch_status] = false
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
+        Thread.current[:branch_wait_count_cancel_active] = false
 
         if __weel_sim
           Thread.current[:branch_sim_pos] = @__weel_sim += 1
@@ -767,6 +771,7 @@ class WEEL
           when :call
             begin
               again = catch Signal::Again do
+                handlerwrapper.mem_guard
                 rs = ReadStructure.new(@__weel_data,@__weel_endpoints,handlerwrapper.additional)
                 if prepare
                   if prepare.is_a?(Proc)
@@ -869,6 +874,25 @@ class WEEL
         @__weel_handlerwrapper::inform_handlerwrapper_error @__weel_handlerwrapper_args, err
         self.__weel_state = :stopping
       ensure
+        handlerwrapper.mem_guard unless handlerwrapper.nil?
+        if Thread.current[:branch_parent]
+          Thread.current[:branch_parent][:mutex].synchronize do
+            if Thread.current[:branch_parent][:branch_wait_count_cancel_condition] == :first
+              if !Thread.current[:branch_wait_count_cancel_active]
+                Thread.current[:branch_wait_count_cancel_active] = true
+                Thread.current[:branch_parent][:branch_wait_count_cancel] += 1
+              end
+              if Thread.current[:branch_parent][:branch_wait_count_cancel] ==  Thread.current[:branch_parent][:branch_wait_count]  && self.__weel_state != :stopping && self.__weel_state != :finishing
+                Thread.current[:branch_parent][:branches].each do |thread|
+                  if thread.alive? && thread != Thread.current
+                    thread[:nolongernecessary] = true
+                    __weel_recursive_continue(thread)
+                  end
+                end
+              end
+            end
+          end
+        end
         Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
       end
     end # }}}
@@ -1104,8 +1128,12 @@ public
   # Stop the workflow execution
   def stop # {{{
     Thread.new do
-      @dslr.__weel_state = :stopping
-      @dslr.__weel_main.join if @dslr.__weel_main
+      if  @dslr.__weel_state == :running
+        @dslr.__weel_state = :stopping
+        @dslr.__weel_main.join if @dslr.__weel_main
+      elsif @dslr.__weel_state == :ready || @dslr.__weel_state == :stopped
+        @dslr.__weel_state = :stopped
+      end
     end
   end # }}}
   # Start the workflow execution

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.93"
+  s.version          = "1.99.98"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.93
+  version: 1.99.98
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Gerhard Stuermer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -86,7 +86,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)
 test_files: