weel 1.99.132 → 1.99.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9715e10ee89085e149a5bfa707b5b3da21b065e8efabb54873a26cc0190bf116
-  data.tar.gz: 6387435bfb8f61dc62729a55e1f29eb1442faeeee209f7f5e96f59b0c4192629
+  metadata.gz: 6e69e303c897530d826b19a2320237f9da49ae0bd439753f537be6fb09b3912c
+  data.tar.gz: 27eedad489106b5bde12a0b8d087cc83fbb51cdc72a23ddce4d9ff95750f6cb3
 SHA512:
-  metadata.gz: e8b56dd1f68e8474b0efcbfca6a8f301af80d96ea57fd1243941762dcdc7951c0cc09bb47dba3fec37bd735c4fabfae7b5627f927b1e930e6acbadd4d7f61b6a
-  data.tar.gz: 7a6aab669342c4d3bb41e2c01e5f02960a3e99c3d2f93eec7c50dd885bd730835fc9ce575196c377aa38104400c6b7510d5e3a25cf2b38fcda505991365bdd88
+  metadata.gz: 54f28321d913e20feb88aa6a8811f7c05ffe59a1e91fc74c08c4c32370aee717ca83a79a3d54d293431cb2c6d60ed1c29dc6cd31df9c99464e1593124c7f0eac
+  data.tar.gz: e92639b7f8d66fbbc5fdc7d6db781282a8d2bca059e2db4fbbd6cc8adf13fc2cb02165b65007ecbf31c473456242ca546a4df99c86c1fac33b8d126aad473f60

data/lib/weel.rb

@@ -241,20 +241,11 @@ class WEEL
     def initialize(id,message)
       @id      = id
       @message = message
-      @nudge   = Queue.new
     end
     def update(id,message)
       @id      = id
       @message = message
     end
-    def nudge!
-      1.upto(@nudge.num_waiting) do
-        @nudge.push(nil)
-      end
-    end
-    def wait_until_nudged!
-      @nudge.pop
-    end
     def to_json(*a)
       {
         'id' => @id,
@@ -498,8 +489,8 @@ class WEEL
     # position: a unique identifier within the wf-description (may be used by the search to identify a starting point)
     # endpoint: (only with :call) ep of the service
     # parameters: (only with :call) service parameters
-    def call(position, endpoint, parameters: {}, finalize: nil, update: nil, prepare: nil, salvage: nil, &finalizeblk) #{{{
-      __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update,prepare,salvage)
+    def call(position, endpoint, parameters: {}, signal: false, finalize: nil, update: nil, prepare: nil, salvage: nil, &finalizeblk) #{{{
+      __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update,prepare,salvage,signal)
     end #}}}
     # when two params, second param always script
     # when block and two params, parameters stays
@@ -521,6 +512,7 @@ class WEEL
       Thread.current[:branch_traces_ids] = 0
       Thread.current[:branch_finished_count] = 0
       Thread.current[:branch_event] = Continue.new
+      Thread.current[:nudge] = Queue.new
       Thread.current[:mutex] = Mutex.new
 
       __weel_protect_yield(&block)
@@ -562,7 +554,7 @@ class WEEL
     end # }}}
 
     # Defines a branch of a parallel-Construct
-    def parallel_branch(data=@__weel_data,&block)# {{{
+    def parallel_branch(data=@__weel_data,&block)# {{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       branch_parent = Thread.current
 
@@ -599,6 +591,9 @@ class WEEL
               branch_parent[:branches].each do |thread|
                 if thread.alive? && thread[:branch_wait_count_cancel_active] == false
                   thread[:nolongernecessary] = true
+                  1.upto(branch_parent[:nudge].num_waiting) do
+                    branch_parent[:nudge].push(nil)
+                  end
                   __weel_recursive_continue(thread)
                 end
               end
@@ -666,6 +661,40 @@ class WEEL
       __weel_protect_yield(&block) if __weel_is_in_search_mode || !Thread.current[:alternative_executed].last
     end # }}}
 
+    def wait_for_signal(position,label) #{{{
+      position = __weel_position_test position
+      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
+
+      uuid = SecureRandom.uuid
+      wp = __weel_progress position, SecureRandom.uuid
+
+      @__weel_connectionwrapper::inform_activity_minimal @__weel_connectionwrapper_args,'calling',uuid,label,position
+
+      Thread.current[:branch_parent][:nudge].pop
+
+      if self.__weel_state != :stopping
+        if Thread.current[:nolongernecessary]
+          @__weel_connectionwrapper::inform_activity_minimal('done', uuid, label, position)
+          Thread.current[:branch_position] = nil
+          @__weel_positions.delete wp
+          @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :unmark => [wp]
+        else
+          @__weel_connectionwrapper::inform_activity_minimal @__weel_connectionwrapper_args, 'done', uuid, label, position
+        end
+      end
+
+      __weel_activity_ensure
+    end #}}}
+
     # Defines a critical block (=Mutex)
     def critical(id,&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
@@ -779,10 +808,13 @@ class WEEL
         connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
         connectionwrapper.test_condition(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,condition,args)
       rescue NameError => err # don't look into it, or it will explode
-        # if you access $! here, BOOOM
         self.__weel_state = :stopping
         @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
+      rescue WEEL::Signal::Error => err
+        self.__weel_state = :stopping
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,err,nil)
+        nil
       rescue => err
         self.__weel_state = :stopping
         @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,err,nil)
@@ -827,7 +859,7 @@ class WEEL
       wp
     end #}}}
 
-    def __weel_activity(position, type, endpoint, parameters, finalize=nil, update=nil, prepare=nil, salvage=nil)# {{{
+    def __weel_activity(position, type, endpoint, parameters, finalize=nil, update=nil, prepare=nil, salvage=nil, signal=false)# {{{
       position = __weel_position_test position
       searchmode = __weel_is_in_search_mode(position)
       return if searchmode == true
@@ -854,6 +886,11 @@ class WEEL
               connectionwrapper.activity_manipulate_handle(parameters)
               connectionwrapper.inform_activity_manipulate
               struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,finalize,'Activity ' + position.to_s)
+              if signal
+                1.upto(Thread.current[:branch_parent][:nudge].num_waiting) do
+                  Thread.current[:branch_parent][:nudge].push(nil)
+                end
+              end
               connectionwrapper.inform_manipulate_change(
                 ((struct && struct.changed_status) ? @__weel_status : nil),
                 ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
@@ -919,6 +956,11 @@ class WEEL
                       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
+                    if signal
+                      1.upto(Thread.current[:branch_parent][:nudge].num_waiting) do
+                        Thread.current[:branch_parent][:nudge].push(nil)
+                      end
+                    end
                     connectionwrapper.inform_manipulate_change(
                       ((struct && struct.changed_status) ? @__weel_status : nil),
                       ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
@@ -927,8 +969,6 @@ 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?
@@ -947,6 +987,7 @@ class WEEL
           wp.detail = :unmark
         end
       rescue Signal::NoLongerNecessary
+        connectionwrapper.activity_stop
         connectionwrapper.inform_activity_cancelled
         connectionwrapper.inform_activity_done
         @__weel_positions.delete wp
@@ -965,27 +1006,31 @@ class WEEL
         @__weel_connectionwrapper::inform_connectionwrapper_error @__weel_connectionwrapper_args, err
         self.__weel_state = :stopping
       ensure
-        connectionwrapper.mem_guard unless connectionwrapper.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_parent][:branch_wait_count_cancel] <  Thread.current[:branch_parent][:branch_wait_count]
-                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[:branch_wait_count_cancel_active] == false
-                    thread[:nolongernecessary] = true
-                    __weel_recursive_continue(thread)
-                  end
+        __weel_activity_ensure connectionwrapper
+      end
+    end # }}}
+
+    def __weel_activity_ensure(connectionwrapper=nil) #{{{
+      connectionwrapper.mem_guard unless connectionwrapper.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_parent][:branch_wait_count_cancel] <  Thread.current[:branch_parent][:branch_wait_count]
+              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[:branch_wait_count_cancel_active] == false
+                  thread[:nolongernecessary] = true
+                  __weel_recursive_continue(thread)
                 end
               end
             end
           end
         end
-        Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
       end
+      Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
     end # }}}
 
     def __weel_recursive_print(thread,indent='')# {{{
@@ -997,6 +1042,11 @@ class WEEL
     end  # }}}
     def __weel_recursive_continue(thread)# {{{
       return unless thread
+      if thread[:nudge]
+        1.upto(thread[:nudge].num_waiting) do
+          thread[:nudge].push(nil)
+        end
+      end
       if thread.alive? && thread[:continue]
         thread[:continue].continue
       end
@@ -1065,7 +1115,6 @@ class WEEL
       @__weel_state = newState
 
       if newState == :stopping || newState == :finishing
-        @__weel_status.nudge!
         __weel_recursive_continue(@__weel_main)
       end
 

data/weel.gemspec

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.132
+  version: 1.99.137
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Gerhard Stuermer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -85,7 +84,6 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)
 test_files: