Purged deprecated function calls (mostly in tests marked failing, but…

… some real tests)
lf-lang · May 7, 2022 · 18d29a0 · 18d29a0
1 parent 94ea0bb
commit 18d29a0
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/test/C/src/DeadlineAnytime.lf b/test/C/src/DeadlineAnytime.lf
@@ -19,7 +19,7 @@ reactor A {
         if (self->i == 42) {
             printf("SUCCESS\n");
         } else {
-            error_print_and_exit("Expected 42, but got %d", self->i);
+            lf_print_error_and_exit("Expected 42, but got %d", self->i);
         }
     =}
 }

diff --git a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.lf
@@ -24,19 +24,19 @@ reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) {
     reaction(in) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
         self->received_count = self->count;
     =} STP (stp_offset) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer); 
         self->received_count = self->count;       
     =} deadline (10 msec) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
         self->received_count = self->count;
     =}

diff --git a/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf b/test/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.lf
@@ -28,17 +28,17 @@ reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) {
     reaction(in) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
     =} STP (stp_offset) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("STP offset was violated. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
     =} deadline (10 msec) {=
         instant_t time_lag = lf_time_physical() - lf_time_logical();
         char time_buffer[28]; // 28 bytes is enough for the largest 64 bit number: 9,223,372,036,854,775,807
-        readable_time(time_buffer, time_lag);
+        lf_readable_time(time_buffer, time_lag);
         lf_print("Deadline miss. Received %d. Logical time is behind physical time by %s nsec.", in->value, time_buffer);
     =}
     in->c.in;

diff --git a/test/C/src/modal_models/ModalStartup.lf b/test/C/src/modal_models/ModalStartup.lf
@@ -19,7 +19,7 @@ reactor Modal {
 
     initial mode One {
         reaction(startup) -> startup1 {=
-            printf("Startup 1 at (%ld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
+            printf("Startup 1 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
             lf_set(startup1, 1);
         =}
 
@@ -31,7 +31,7 @@ reactor Modal {
     }
     mode Two {        
         reaction(startup) -> startup2 {=
-            printf("Startup 2 at (%ld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
+            printf("Startup 2 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
             lf_set(startup2, 1);
         =}
 
@@ -44,7 +44,7 @@ reactor Modal {
 
     mode Three {        
         reaction(startup) -> startup3 {=
-            printf("Startup 3 at (%ld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
+            printf("Startup 3 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep);
             lf_set(startup3, 1);
         =}
 

diff --git a/test/Python/src/federated/failing/DistributedCountDecentralizedLateDownstream.lf b/test/Python/src/federated/failing/DistributedCountDecentralizedLateDownstream.lf
@@ -47,7 +47,7 @@ reactor ImportantActuator {
                          (tag_t){.time=SEC(1) *  self->c, .microstep=0}) == 0) {
             self->success++; // Message was on-time
         } else {
-            error_print_and_exit("Normal reaction was invoked, but current tag doesn't match expected tag.");
+            lf_print_error_and_exit("Normal reaction was invoked, but current tag doesn't match expected tag.");
         }
         self->c++;
     =} STP (0) {=
@@ -65,7 +65,7 @@ reactor ImportantActuator {
 
     reaction(shutdown) {=
         if ((self->success +  self->success_stp_violation) != 2) {
-            error_print_and_exit("Failed to detect STP violation in messages.");
+            lf_print_error_and_exit("Failed to detect STP violation in messages.");
         } else {
             info_print("Successfully detected STP violations (%d violations, %d on-time).", self->success_stp_violation, self->success);
         }

diff --git a/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf b/test/Python/src/federated/failing/DistributedLoopedActionDecentralized.lf
@@ -79,7 +79,7 @@ reactor Receiver(take_a_break_after:int(10), break_interval:time(400 msec)) {
         if (self->breaks != 3 ||
             (self->total_received_messages != ((SEC(1)/self->break_interval)+1) * self->take_a_break_after)
         ) {
-            error_print_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
+            lf_print_error_and_exit("Test failed. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
         }
         info_print("SUCCESS: Successfully received all messages from the sender. Breaks: %d, Messages: %d.", self->breaks, self->total_received_messages);
     =}

diff --git a/test/Python/src/federated/failing/LoopDistributedCentralized.lf b/test/Python/src/federated/failing/LoopDistributedCentralized.lf
@@ -53,7 +53,7 @@ reactor Looper(incr:int(1), delay:time(0 msec)) {
         // Stop the thread that is scheduling actions.
         stop = true;
         if (self->count != 5 * self->incr) {
-            error_print_and_exit("Failed to receive all five expected inputs.");
+            lf_print_error_and_exit("Failed to receive all five expected inputs.");
         }
     =}
 }

diff --git a/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf b/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.lf
@@ -34,13 +34,13 @@ reactor Looper(incr:int(1), delay:time(0 msec)) {
     =}
     reaction(t) {=
         if (self->received_count != self->count) {
-            error_print_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
+            lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
         }
     =}
     reaction(shutdown) {=
         info_print("******* Shutdown invoked.");
         if (self->count != 6 * self->incr) {
-            error_print_and_exit("Failed to receive all six expected inputs.");
+            lf_print_error_and_exit("Failed to receive all six expected inputs.");
         }
     =}
 }

diff --git a/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedenceHierarchy.lf b/test/Python/src/federated/failing/LoopDistributedCentralizedPrecedenceHierarchy.lf
@@ -29,7 +29,7 @@ reactor Contained (incr:int(1)) {
     =}
     reaction(t) {=
         if (self->received_count != self->count) {
-            error_print_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
+            lf_print_error_and_exit("reaction(t) was invoked before reaction(in). Precedence order was not kept.");
         }
     =}
 }
@@ -57,7 +57,7 @@ reactor Looper(incr:int(1), delay:time(0 msec)) {
     reaction(shutdown) {=
         info_print("******* Shutdown invoked.");
         if (self->count != 6 * self->incr) {
-            error_print_and_exit("Failed to receive all six expected inputs.");
+            lf_print_error_and_exit("Failed to receive all six expected inputs.");
         }
     =}
 }

diff --git a/test/Python/src/federated/failing/LoopDistributedDecentralized.lf b/test/Python/src/federated/failing/LoopDistributedDecentralized.lf
@@ -62,7 +62,7 @@ reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) {
         // Stop the thread that is scheduling actions.
         stop = true;
         if (self->count != 5 * self->incr) {
-            error_print_and_exit("Failed to receive all five expected inputs.");
+            lf_print_error_and_exit("Failed to receive all five expected inputs.");
         }
     =}
 }

diff --git a/test/Python/src/federated/failing/LoopDistributedDouble.lf b/test/Python/src/federated/failing/LoopDistributedDouble.lf
@@ -69,7 +69,7 @@ reactor Looper(incr(1), delay(0 msec)) {
         // Stop the thread that is scheduling actions.
         stop = true;
         if (self->count != 5 * self->incr) {
-            error_print_and_exit("Failed to receive all five expected inputs.");
+            lf_print_error_and_exit("Failed to receive all five expected inputs.");
         }
     =}
 }