weel 1.99.97 → 1.99.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357f0f0172e195152fffb470efa58627a6824d5ec034a9fbb9c005afc2a4682b
-  data.tar.gz: ea501b321add0fb22f677fb61d39c0515c0054168959cecba02f7707fc7a0dd4
+  metadata.gz: 9e82bd07a1a46e7456badf0f68f51b61ce8185c4292590e2c3113e3dcef9b23b
+  data.tar.gz: a8e5dc3301a874267a5742395816501d778c2b7ccd934590c55e28410c34994e
 SHA512:
-  metadata.gz: 731c6bd0b2ce102011fd30cc95565554b2bd28e316a15c6db7450597c30620644656b68a803016fd69e25b79b580abda4e6110e46c904edf18aa3c33a9374f31
-  data.tar.gz: 151781be93c788dd63b04ca9cc4cc1aab423c3245b30da95b3f148573baa6689e542d7b85fd59d13437c99a2331ef8fa39baf23c7420bd08b387c344c9987d81
+  metadata.gz: 8b37432797796439fcff05c476d09f1c3f7ee388f01a83e593c9db8fcb7bc57f413f5809f0a48c31b2ba04f146928ec236a87e6e5e1ca78a487c7eccbfcb82a2
+  data.tar.gz: be8e00b7a57362406dfd61d9c84d53ad2451f7219c535c0a2e4562eedd527dba6ca50c32a735e8d898e959eeb6ac9e120ab9e6507f476dfebe9e96cbaa22d60f

data/lib/weel.rb

@@ -417,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
@@ -460,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
@@ -872,6 +875,24 @@ class WEEL
         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 # }}}

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.97"
+  s.version          = "1.99.98"
   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.97
+  version: 1.99.98
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit