weel 1.99.111 → 1.99.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06de4e72e80c63aa6cd62cb267e837823a6099ef8b100031eeb5e817f950ff2
-  data.tar.gz: f227674b5d4f22a49d6d96e823a618fc508e48e250a50dee08603d128d30d5f4
+  metadata.gz: ccdb4515278ad68f38a35abef85197ca3f0732131f93c2323fe3e8cb1123df39
+  data.tar.gz: c436c8bf90eca6a370d67a71c14ef094507b43802ce2bf6b10bb9d863034a814
 SHA512:
-  metadata.gz: 23321928b269cfb7358187d79e786fd6efef7b0ad4694b35d71af6f0e63f175a2228356ee8a781de4f64d106dc84d790c585a89468065ac37b07dd3cf60c550e
-  data.tar.gz: 8881323b085b5e928412476f21e5ebe5d2f5fd9a9da0f30c65d2da16643c88bd21507331d9ee6b097d99643d25aefa6882cc4a11eb7e4faf32cd4a32f2bc2460
+  metadata.gz: 055bc4890e45536bd725110f837b57f6fb810811ae9b17ce94c9f0f286ba73e3dc19bf6d6170455f3a687d3dac500e2dac6e5886922ba17e601034a562f808ff
+  data.tar.gz: 9e18656c48d1e8bb0d580e2eb0336161df469a38da3964eab0af0fa4d19593f85c40a20a55cd5a6299d113ccb4a1ef023531bf47d031f2ef5a0469ea8f23e13a

data/lib/weel.rb

@@ -322,7 +322,7 @@ class WEEL
 
     def initialize(arguments,position=nil,continue=nil); end
 
-    def prepare(readonly, endpoints, parameters, replay=false); parameters; end
+    def prepare(readonly, endpoints, parameters); parameters; end
     def additional; {}; end
 
     def activity_handle(passthrough, parameters); end
@@ -460,10 +460,9 @@ class WEEL
       @__weel_connectionwrapper_args = []
       @__weel_state = :ready
       @__weel_status = Status.new(0,"undefined")
-      @__weel_replay = false
       @__weel_sim = -1
     end #}}}
-    attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_connectionwrapper, :__weel_connectionwrapper_args, :__weel_replay
+    attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_connectionwrapper, :__weel_connectionwrapper_args
     attr_reader :__weel_state, :__weel_status
 
     # DSL-Constructs for atomic calls to external services (calls) and pure context manipulations (manipulate).
@@ -885,7 +884,7 @@ class WEEL
                     connectionwrapper.manipulate(rs,prepare,'Activity ' + position.to_s)
                   end
                 end
-                params = connectionwrapper.prepare(rs,endpoint,parameters,@__weel_replay)
+                params = connectionwrapper.prepare(rs,endpoint,parameters)
                 raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
                 raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
@@ -895,6 +894,9 @@ class WEEL
                   @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :wait => [wp]
                 end
                 begin
+                  # cleanup after callback updates
+                  connectionwrapper.mem_guard
+
                   # with loop if catching Signal::Again
                   # handshake call and wait until it finished
                   waitingresult = nil
@@ -1098,7 +1100,6 @@ class WEEL
       if newState == :stopping || newState == :finishing
         @__weel_status.nudge!
         __weel_recursive_continue(@__weel_main)
-        __weel_replay = false
       end
 
       @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
@@ -1255,11 +1256,6 @@ public
     end
   end # }}}
 
-  def replay
-    @dslr.__weel_replay = true
-    start
-  end
-
   def sim # {{{
     stat = @dslr.__weel_state
     return nil unless stat == :ready || stat == :stopped

data/test/basic/tc_wf_control.rb

@@ -18,26 +18,26 @@ class TestWorkflowControl < Test::Unit::TestCase
     assert(@wf.data[:x] == "begin_Handler_Dummy_Result_end", "Ending environment not correct, see result=#{@wf.data[:x].inspect}")
   end
 
-  # def test_stop
-  #   @wf.description do
-  #     call :a_test_1_1, :endpoint1
-  #     call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
-  #     call :a_test_1_3, :endpoint1
-  #   end
-  #   @wf.search WEEL::Position.new(:a_test_1_1, :at)
-  #   wf = @wf.start
-  #   sleep(0.2)
-  #   @wf.stop.join
-  #   wf.join
-  #   wf_assert("DONE a_test_1_1")
-  #   wf_assert("STOPPED a_test_1_2")
-  #   wf_assert("DONE a_test_1_2",false)
-  #   wf_assert("CALL a_test_1_2:")
-  #   assert(@wf.state == :stopped, "Stopped workflow has wrong state, #{@wf.state} instead of :stopped")
-  #   assert(@wf.positions.is_a?(Array), "@wf.positions has wrong type, should be an array, it is: #{@wf.positions.inspect}")
-  #   assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
-  #   assert(@wf.positions[0].detail == :at, "Stop-Position is not :at")
-  # end
+  def test_stop
+    @wf.description do
+      call :a_test_1_1, :endpoint1
+      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
+      call :a_test_1_3, :endpoint1
+    end
+    @wf.search WEEL::Position.new(:a_test_1_1, :at)
+    wf = @wf.start
+    sleep(0.2)
+    @wf.stop.join
+    wf.join
+    wf_assert("DONE a_test_1_1")
+    wf_assert("STOPPED a_test_1_2")
+    wf_assert("DONE a_test_1_2",false)
+    wf_assert("CALL a_test_1_2:")
+    assert(@wf.state == :stopped, "Stopped workflow has wrong state, #{@wf.state} instead of :stopped")
+    assert(@wf.positions.is_a?(Array), "@wf.positions has wrong type, should be an array, it is: #{@wf.positions.inspect}")
+    assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
+    assert(@wf.positions[0].detail == :at, "Stop-Position is not :at")
+  end
   # def test_continue
   #   @wf.description do
   #     call :a_test_1_1, :endpoint1

data/test/basic/tc_wf_stop.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
+
+class TestWorkflowControl < Test::Unit::TestCase
+  include TestMixin
+
+  def test_stop
+    @wf.description do
+      call :a_test_1_1, :endpoint1
+      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
+      call :a_test_1_3, :endpoint1
+    end
+    @wf.search WEEL::Position.new(:a_test_1_1, :at)
+    wf = @wf.start
+    sleep(0.2)
+    @wf.stop.join
+    wf.join
+    wf_assert("DONE a_test_1_1")
+    wf_assert("STOPPED a_test_1_2")
+    wf_assert("DONE a_test_1_2")
+    wf_assert("CALL a_test_1_2:")
+    assert(@wf.state == :stopped, "Stopped workflow has wrong state, #{@wf.state} instead of :stopped")
+    assert(@wf.positions.is_a?(Array), "@wf.positions has wrong type, should be an array, it is: #{@wf.positions.inspect}")
+    assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
+    assert(@wf.positions[0].detail == :after, "Stop-Position is not :at")
+  end
+
+  def test_stops
+    1.upto 1000 do |i|
+      puts '.'
+      test_stop
+    end
+  end
+end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.111"
+  s.version          = "1.99.113"
   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.111
+  version: 1.99.113
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -58,6 +58,7 @@ files:
 - test/basic/tc_search.rb
 - test/basic/tc_state.rb
 - test/basic/tc_wf_control.rb
+- test/basic/tc_wf_stop.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
 - test/complex/tc_parallel_stop.rb
 - test/complexsearch/tc_search.rb
@@ -122,6 +123,7 @@ test_files:
 - test/basic/tc_search.rb
 - test/basic/tc_state.rb
 - test/basic/tc_wf_control.rb
+- test/basic/tc_wf_stop.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
 - test/complex/tc_parallel_stop.rb
 - test/complexsearch/tc_search.rb