diff --git a/lingua-franca b/lingua-franca index 9e909a822..2b6ebad9e 160000 --- a/lingua-franca +++ b/lingua-franca @@ -1 +1 @@ -Subproject commit 9e909a822efbf8adb68a83ae50576aa5217b23e4 +Subproject commit 2b6ebad9ec51b3c82b4cea6ed637f47afe067c7f diff --git a/test/known-good/C/src/federated/CycleDetection.html b/test/known-good/C/src/federated/CycleDetection.html index db9b851b9..5fdbf38aa 100644 --- a/test/known-good/C/src/federated/CycleDetection.html +++ b/test/known-good/C/src/federated/CycleDetection.html @@ -306,6 +306,28 @@ } + + lf_print( + + +" + + +Balance updated to %d. + + +" + + +, self + + +-> + + +balance); + + @@ -352,6 +374,28 @@ balance); + + lf_print( + + +" + + +Sending balance of %d. + + +" + + +, self + + +-> + + +balance); + + @@ -484,6 +528,22 @@ ); + + lf_print( + + +" + + +Sending deposit of 100. + + +" + + +); + + diff --git a/test/known-good/C/src/federated/EnclaveFederatedRequestStop.html b/test/known-good/C/src/federated/EnclaveFederatedRequestStop.html deleted file mode 100644 index c17573128..000000000 --- a/test/known-good/C/src/federated/EnclaveFederatedRequestStop.html +++ /dev/null @@ -1,472 +0,0 @@ - -/** - - - - * Test that enclaves within federates all stop at the time requested by the first enclave to - - - - * request a stop. Note that the test has no timeout because any finite timeout can, in theory, - - - - * cause the test to fail. The first federate to request a stop does so at 50 ms, so the program - - - - * should terminate quickly if all goes well. - - - - - - -*/ - - - -target - - - - - -C - - - - - - - -reactor - - - - - -Stop - - -( - - - - - - -// Zero value here means "don't stop". - - - - stop_time: - - -time - - - - - -= - - - - - -0 - - -) { - - - - - - -timer - - - t(stop_time) - - - - - - - - - - -reaction - - -( - - -t) { - - -= - - - - if (self - - --> - - -stop_time > - - -0 - - -) lf_request_stop(); - - - - - - -= - - -} - - - - - - - - - - -reaction - - -( - - -shutdown - - -) { - - -= - - - - lf_print( - - -" - - -Stopped at tag ( - - -" - - - PRINTF_TIME - - -" - - -, %d) - - -" - - -, lf_time_logical_elapsed(), lf_tag() - - -. - - -microstep); - - - - if (lf_time_logical_elapsed() ! - - -= - - - 50000000LL || lf_tag() - - -. - - -microstep ! - - -= - - - - - -1 - - -) { - - - - lf_print_error_and_exit( - - -" - - -Expected stop tag to be (50ms, 1). - - -" - - -); - - - - } - - - - - - -= - - -} - - - -} - - - - - - - -reactor - - - - - -Fed - - -(least_stop_time: - - -time - - - - - -= - - - - - -0 - - -) { - - - - - - -@ - - -enclave - - - - - - -s1 - - - - - -= - - - - - -new - - - - - -Stop - - -() - - - - - - -@ - - -enclave - - - - - - -s2 - - - - - -= - - - - - -new - - - - - -Stop - - -(stop_time - - -= - - -least_stop_time) - - - -} - - - - - - - -federated - - - - - -reactor - - - { - - - - - - -f1 - - - - - -= - - - - - -new - - - - - -Fed - - -() - - - - - - -f2 - - - - - -= - - - - - -new - - - - - -Fed - - -(least_stop_time - - -= - - - - - -50 - - - ms) - - - -} - - - - - -