weel 1.99.128 → 1.99.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db2306d1398c142ad06651d1a9db48e0c9a4943133f9bd6571b5bc2471a0c2a2
-  data.tar.gz: c181a1d7ef50b406e97dbefff98d3cd326323c3aaf77e87605ab2c6eeae3397d
+  metadata.gz: a65829729d2a2508096cec3ee8ab6ee5abbd32d718cc50a4b2c68fc5632728bc
+  data.tar.gz: 4c1a71c7a48f37a41fe99c8b79f70adc2fa175f44635ead7694c7d3a5a4865ba
 SHA512:
-  metadata.gz: 92d0c335a5e58548963d9e5fa22ef985534670bc26f077636065f558ffb159210b38e27b6262f2ba0dffe45c8f593d8e905315ca6cafd09c72d9c38cdcbea267
-  data.tar.gz: d65d56e15a65ccbb609e5a205743a59dbede363d4b3772432a5ee04a1ecc39e2f4402dce911f1a0922aa3b166a5e037b88f1f2ec1fc982386d20be15f9c2c0b7
+  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
@@ -875,70 +876,77 @@ class WEEL
               @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :after => [wp]
             end
           when :call
-            again = catch Signal::Again do # Will be nil if we do not throw (using default connectionwrapper)
-              connectionwrapper.mem_guard
-              params = connectionwrapper.prepare(@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,prepare,endpoint,parameters)
-
-              raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
-              raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
-
-              connectionwrapper.activity_handle wp.passthrough, params
-              wp.passthrough = connectionwrapper.activity_passthrough_value
-              unless wp.passthrough.nil?
-                @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :wait => [wp]
-              end
-              begin
-                # cleanup after callback updates
+            begin
+              again = catch Signal::Again do # Will be nil if we do not throw (using default connectionwrapper)
                 connectionwrapper.mem_guard
+                params = connectionwrapper.prepare(@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,prepare,endpoint,parameters)
 
-                # with loop if catching Signal::Again
-                # handshake call and wait until it finished
-                waitingresult = nil
-                waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
+                raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
+                raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
-                if Thread.current[:nolongernecessary]
-                  connectionwrapper.activity_no_longer_necessary
-                  raise Signal::NoLongerNecessary
-                end
-                if self.__weel_state == :stopping || self.__weel_state == :finishing
-                  connectionwrapper.activity_stop
-                  wp.passthrough = connectionwrapper.activity_passthrough_value
-                  raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
+                connectionwrapper.activity_handle wp.passthrough, params
+                wp.passthrough = connectionwrapper.activity_passthrough_value
+                unless wp.passthrough.nil?
+                  @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :wait => [wp]
                 end
+                begin
+                  # cleanup after callback updates
+                  connectionwrapper.mem_guard
 
-                next if waitingresult == WEEL::Signal::UpdateAgain && connectionwrapper.activity_result_value&.length == 0
+                  # with loop if catching Signal::Again
+                  # handshake call and wait until it finished
+                  waitingresult = nil
+                  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]
+                    raise Signal::NoLongerNecessary
+                  end
+                  if self.__weel_state == :stopping || self.__weel_state == :finishing
+                    connectionwrapper.activity_stop
+                    wp.passthrough = connectionwrapper.activity_passthrough_value
+                    raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
+                  end
+
+                  next if waitingresult == WEEL::Signal::UpdateAgain && connectionwrapper.activity_result_value&.length == 0
+
+                  code, cmess = if waitingresult == WEEL::Signal::UpdateAgain
+                    [update, 'update']
+                  elsif waitingresult == WEEL::Signal::Salvage
+                    if salvage
+                      [salvage, 'salvage']
+                    else
+                      raise('HTTP Error. The service return status was not between 200 and 300.')
+                    end
+                  else
+                    [finalize, 'finalize']
+                  end
+                  if code.is_a?(String)
+                    connectionwrapper.inform_activity_manipulate
+                    struct = nil
+
+                    # when you throw without parameters, ma contains nil, so we return Signal::Proceed to give ma a meaningful value in other cases
+                    ma = catch Signal::Again do
+                      struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s + ' ' + cmess,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
+                      Signal::Proceed
+                    end
+                    connectionwrapper.inform_manipulate_change(
+                      ((struct && struct.changed_status) ? @__weel_status : nil),
+                      ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
+                      ((struct && struct.changed_endpoints.any?) ? struct.changed_endpoints.uniq : nil),
+                      @__weel_data,
+                      @__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
 
-                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.')
-                else
-                  [finalize, 'finalize']
-                end
-                if code.is_a?(String)
-                  connectionwrapper.inform_activity_manipulate
-                  struct = nil
-
-                  # when you throw without parameters, ma contains nil, so we return Signal::Proceed to give ma a meaningful value in other cases
-                  ma = catch Signal::Again do
-                    struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s + ' ' + cmess,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
-                    Signal::Proceed
                   end
-                  connectionwrapper.inform_manipulate_change(
-                    ((struct && struct.changed_status) ? @__weel_status : nil),
-                    ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
-                    ((struct && struct.changed_endpoints.any?) ? struct.changed_endpoints.uniq : nil),
-                    @__weel_data,
-                    @__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
+                end while waitingresult == Signal::UpdateAgain # this signal again loops because async update, proposal: rename to UpdateAgain
+                if connectionwrapper.activity_passthrough_value.nil?
+                  connectionwrapper.inform_activity_done
+                  wp.passthrough = nil
+                  wp.detail = :after
+                  @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :after => [wp]
                 end
-              end while waitingresult == Signal::UpdateAgain # this signal again loops because async update, proposal: rename to UpdateAgain
-              if connectionwrapper.activity_passthrough_value.nil?
-                connectionwrapper.inform_activity_done
-                wp.passthrough = nil
-                wp.detail = :after
-                @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :after => [wp]
               end
             end while again == Signal::Again # there is a catch
         end
@@ -949,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

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.128"
+  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.128
+  version: 1.99.130
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-23 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)