weel 1.99.129 → 1.99.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a9d1b00bfbd9df62e95f290c520c447b8cb2bb4d4add32efa2b7ec2e31fc54
-  data.tar.gz: 8d0d3bb0a413fb1ad7a2d81ea63c2eade55e5f0173045daaced8f495fc6f1de0
+  metadata.gz: a65829729d2a2508096cec3ee8ab6ee5abbd32d718cc50a4b2c68fc5632728bc
+  data.tar.gz: 4c1a71c7a48f37a41fe99c8b79f70adc2fa175f44635ead7694c7d3a5a4865ba
 SHA512:
-  metadata.gz: cce8bf3f578fd2700c317a011437fc6f806f5b4b51d335473a041c3e0253fa06e981d9dfd00edebbae8c9cad1b8a1bbfe20e4afab3445b1549eda6cab18b5281
-  data.tar.gz: 8497d993333e112bf56c4431040ca454ee8eeeb57f6fd9437abe9c6deac2b6115c0b672aa28e8ce2f47d23dcc5b5f6226315fd6e0d9f01d7507bfe1460c48b86
+  metadata.gz: f6f771194196936be9d5b82fe7995fdf432bc61a59abfc51b004cd214a2b9738947e8eb90ef23bc0558dc5871d772358bff92109a21afa9cae18a303584dcfae
+  data.tar.gz: 5df275e55141dc2beb82530b968b0afa004985466f829acb59d7d48debb23f02180b96ddf2c6fb1dd0327049a61b0321a23dce67d8d7de42177ab524a2492482

data/lib/weel.rb

@@ -355,9 +355,8 @@ class WEEL
     def activity_passthrough_value; end
     def activity_uuid; '42424242-cpee-cpee-cpee-424242424242'; end
 
-    def activity_no_longer_necessary; end
-
     def inform_activity_done; end
+    def inform_activity_cancelled; end
     def inform_activity_manipulate; end
     def inform_activity_failed(err); end
     def inform_manipulate_change(status,changed_data,changed_endpoints,data,endpoints); end
@@ -380,8 +379,8 @@ class WEEL
       end
     end
 
-    def join_branches(branches); end
-    def split_branches(branches); end
+    def join_branches(id,branches=[]); end
+    def split_branches(id,branches=[]); end
   end  # }}}
 
   class Position # {{{
@@ -534,7 +533,7 @@ class WEEL
       end
 
       cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
-      cw.split_branches(Thread.current[:branch_traces])
+      cw.split_branches Thread.current.__id__, Thread.current[:branch_traces]
 
       Thread.current[:branches].each do |thread|
         # decide after executing block in parallel cause for coopis
@@ -547,7 +546,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[:branch_traces])
+      cw.join_branches Thread.current.__id__, 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
@@ -635,9 +634,11 @@ class WEEL
       Thread.current[:alternative_mode] << mode
 
       cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
-      cw.split_branches(Thread.current[:branch_traces])
 
+      cw.split_branches Thread.current.__id__
       __weel_protect_yield(&block)
+      cw.join_branches Thread.current.__id__
+
       Thread.current[:alternative_executed].pop
       Thread.current[:alternative_mode].pop
       nil
@@ -898,7 +899,6 @@ class WEEL
                   waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
 
                   if Thread.current[:nolongernecessary]
-                    connectionwrapper.activity_no_longer_necessary
                     raise Signal::NoLongerNecessary
                   end
                   if self.__weel_state == :stopping || self.__weel_state == :finishing
@@ -912,7 +912,11 @@ class WEEL
                   code, cmess = if waitingresult == WEEL::Signal::UpdateAgain
                     [update, 'update']
                   elsif waitingresult == WEEL::Signal::Salvage
-                    [salvage, 'salvage'] || raise('HTTP Error. The service return status was not between 200 and 300.')
+                    if salvage
+                      [salvage, 'salvage']
+                    else
+                      raise('HTTP Error. The service return status was not between 200 and 300.')
+                    end
                   else
                     [finalize, 'finalize']
                   end
@@ -933,6 +937,8 @@ class WEEL
                       @__weel_endpoints
                     )
                     throw(Signal::Again, Signal::Again) if ma.nil? || ma == Signal::Again # this signal again loops "there is a catch" because rescue signal throw that throughly restarts the task
+                  else
+
                   end
                 end while waitingresult == Signal::UpdateAgain # this signal again loops because async update, proposal: rename to UpdateAgain
                 if connectionwrapper.activity_passthrough_value.nil?
@@ -951,6 +957,7 @@ class WEEL
           wp.detail = :unmark
         end
       rescue Signal::NoLongerNecessary
+        connectionwrapper.inform_activity_cancelled
         connectionwrapper.inform_activity_done
         @__weel_positions.delete wp
         Thread.current[:branch_position] = nil
@@ -1064,7 +1071,7 @@ class WEEL
     def __weel_state=(newState)# {{{
       return @__weel_state if newState == @__weel_state && @__weel_state != :ready
 
-      @__weel_positions = Array.new if newState == :running || @dslr.__weel_state == :simulating
+      @__weel_positions = Array.new if newState == :running
       @__weel_state = newState
 
       if newState == :stopping || newState == :finishing
@@ -1145,7 +1152,7 @@ public
           @dslr.__weel_state = :stopping
           @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,err,code)
         end
-        if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing || @dslr.__weel_state == :simulating
+        if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing
           ipc = { :unmark => [] }
           @dslr.__weel_positions.each{ |wp| ipc[:unmark] << wp }
           @dslr.__weel_positions.clear
@@ -1204,7 +1211,7 @@ public
   # Stop the workflow execution
   def stop # {{{
     Thread.new do
-      if  @dslr.__weel_state == :running || @dslr.__weel_state == :simulating
+      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
@@ -1226,18 +1233,12 @@ public
       end
     end
   end # }}}
-  # Sim the workflow execution
+
   def sim # {{{
-    return nil if @dslr.__weel_state != :ready && @dslr.__weel_state != :stopped
+    stat = @dslr.__weel_state
+    return nil unless stat == :ready || stat == :stopped
     @dslr.__weel_main = Thread.new do
-      Thread.current[:branch_search] = true if @dslr.__weel_search_positions.any?
-      begin
-        __weel_control_flow(:simulating, stat)
-      rescue => e
-        puts e.message
-        puts e.backtrace
-        connectionwrapper::inform_connectionwrapper_error connectionwrapper_args, e
-      end
+      __weel_control_flow :simulating, stat
     end
   end # }}}
 

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.129"
+  s.version          = "1.99.130"
   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.129
+  version: 1.99.130
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)