Add maxwait, start time coordination and system events

.github/workflows/formating.yml → .github/workflows/formatting.yml

@@ -11,7 +11,7 @@ permissions:
 
 jobs:
   formating:
-    name: formating
+    name: formatting
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout

.github/workflows/riot.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Run platform tests
         working-directory: ${{ github.workspace }}/test/platform/riot
-        run: ./runAll.sh
+        run: timeout 120 ./runAll.sh
 
       - name: Build examples
         working-directory: ${{ github.workspace }}/examples/riot

CMakeLists.txt

@@ -9,8 +9,6 @@ set(TEST_COVERAGE OFF CACHE BOOL "Compute test coverage")
 set(ASAN OFF CACHE BOOL "Compile with AddressSanitizer")
 set(PLATFORM "POSIX" CACHE STRING "Platform to target")
 set(SCHEDULER "DYNAMIC" CACHE STRING "Scheduler to use")
-set(EVENT_QUEUE_SIZE 32 CACHE STRING "Static size of the event queue")
-set(REACTION_QUEUE_SIZE 32 CACHE STRING "Static size of the reaction queue")
 set(NETWORK_CHANNEL_TCP_POSIX OFF CACHE BOOL "Use POSIX TCP NetworkChannel")
 
 # Code coverage setup 
@@ -83,11 +81,6 @@ target_compile_definitions(reactor-uc PUBLIC "PLATFORM_${PLATFORM}")
 # Add compile definition for scheduler used
 target_compile_definitions(reactor-uc PRIVATE "SCHEDULER_${SCHEDULER}")
 
-# Add compile definitions for event and reaction queue sizes. Has to be PUBLIC because they are used in the header files.
-message(STATUS "Setting event queue size to ${EVENT_QUEUE_SIZE} and reaction queue size to ${REACTION_QUEUE_SIZE}")
-target_compile_definitions(reactor-uc PUBLIC EVENT_QUEUE_SIZE=${EVENT_QUEUE_SIZE})
-target_compile_definitions(reactor-uc PUBLIC REACTION_QUEUE_SIZE=${REACTION_QUEUE_SIZE})
-
 if(NETWORK_CHANNEL_TCP_POSIX)
   target_compile_definitions(reactor-uc PRIVATE NETWORK_CHANNEL_TCP_POSIX)
 endif()

Makefile

@@ -35,17 +35,18 @@ asan:
 	make test -C build
 
 # Format the code base
-SRC_FILES := $(shell find ./src -path ./src/generated -prune -o -name '*.c' -print)
+SRC_FILES := $(shell find ./src ./test/unit/ -path ./src/generated -prune -o -name '*.c' -print)
 HDR_FILES := $(shell find ./include -path ./include/reactor-uc/generated -prune -o -name '*.h' -print)
 
 format:
 	clang-format -i -style=file $(SRC_FILES) $(HDR_FILES)
-	cd lfc && ./gradlew ktfmtFormat && cd ..
+	cd lfc && ./gradlew spotlessApply
+	cd lfc && ./gradlew ktfmtFormat && ./gradlew spotlessApply && cd ..
 
 # Check that the code base is formatted
 format-check:
 	clang-format --dry-run --Werror -style=file $(SRC_FILES) $(HDR_FILES)
-	cd lfc && ./gradlew ktfmtCheck && cd ..
+	cd lfc && ./gradlew ktfmtCheck && ./gradlew spotlessCheck && cd ..
 
 # Run the entire CI flow
 ci: clean test coverage format-check

examples/common/timer_source.h

@@ -3,7 +3,7 @@
 LF_DEFINE_TIMER_STRUCT(TimerSource, t, 1, 0);
 LF_DEFINE_TIMER_CTOR(TimerSource, t, 1, 0);
 LF_DEFINE_REACTION_STRUCT(TimerSource, r, 0);
-LF_DEFINE_REACTION_CTOR(TimerSource, r, 0);
+LF_DEFINE_REACTION_CTOR(TimerSource, r, 0, NULL, NEVER, NULL);
 
 typedef struct {
   Reactor super;
@@ -21,4 +21,4 @@ LF_REACTOR_CTOR_SIGNATURE(TimerSource) {
   LF_TIMER_REGISTER_EFFECT(self->t, self->r);
 }
 
-LF_ENTRY_POINT(TimerSource, SEC(1), false, false);
+LF_ENTRY_POINT(TimerSource,32,32, SEC(1), false, false);

examples/posix/federated/receiver.c

@@ -20,7 +20,7 @@ lf_ret_t deserialize_msg_t(void *user_struct, const unsigned char *msg_buf, size
 }
 
 LF_DEFINE_REACTION_STRUCT(Receiver, r, 0);
-LF_DEFINE_REACTION_CTOR(Receiver, r, 0);
+LF_DEFINE_REACTION_CTOR(Receiver, r, 0, NULL, NEVER, NULL);
 LF_DEFINE_INPUT_STRUCT(Receiver, in, 1, 0, msg_t, 0);
 LF_DEFINE_INPUT_CTOR(Receiver, in, 1, 0, msg_t, 0);
 
@@ -51,7 +51,7 @@ LF_REACTOR_CTOR_SIGNATURE_WITH_PARAMETERS(Receiver, InputExternalCtorArgs *in_ex
 }
 
 LF_DEFINE_FEDERATED_INPUT_CONNECTION_STRUCT(Receiver, in, msg_t, 5);
-LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, msg_t, 5, MSEC(100), false);
+LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, msg_t, 5, MSEC(100), false, 0);
 
 typedef struct {
   FederatedConnectionBundle super;
@@ -67,12 +67,16 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Receiver, Sender) {
   LF_INITIALIZE_FEDERATED_INPUT_CONNECTION(Receiver, in, deserialize_msg_t);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 1);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 1, 1);
+
 typedef struct {
   Reactor super;
   LF_CHILD_REACTOR_INSTANCE(Receiver, receiver, 1);
   LF_FEDERATED_CONNECTION_BUNDLE_INSTANCE(Receiver, Sender);
   LF_FEDERATE_BOOKKEEPING_INSTANCES(1);
   LF_CHILD_INPUT_SOURCES(receiver, in, 1, 1, 0);
+  FederateStartupCoordinator startup_coordinator;
 } MainRecv;
 
 LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
@@ -81,10 +85,11 @@ LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
   LF_DEFINE_CHILD_INPUT_ARGS(receiver, in, 1, 1);
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Receiver, receiver, 1, _receiver_in_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Receiver, Sender);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
   lf_connect_federated_input(&self->Receiver_Sender_bundle.inputs[0]->super, &self->receiver->in[0].super);
 }
 
-LF_ENTRY_POINT_FEDERATED(MainRecv, SEC(1), true, true, 1, false)
+LF_ENTRY_POINT_FEDERATED(MainRecv,32,0,32, SEC(1), true, 1, false)
 
 int main() {
   lf_start();

examples/posix/federated/sender.c

@@ -12,7 +12,7 @@ typedef struct {
   char msg[512];
 } msg_t;
 
-size_t serialize_msg_t(const void *user_struct, size_t user_struct_size, unsigned char *msg_buf) {
+int serialize_msg_t(const void *user_struct, size_t user_struct_size, unsigned char *msg_buf) {
   const msg_t *msg = user_struct;
 
   memcpy(msg_buf, &msg->size, sizeof(msg->size));
@@ -24,7 +24,7 @@ size_t serialize_msg_t(const void *user_struct, size_t user_struct_size, unsigne
 LF_DEFINE_TIMER_STRUCT(Sender, t, 1, 0)
 LF_DEFINE_TIMER_CTOR(Sender, t, 1, 0)
 LF_DEFINE_REACTION_STRUCT(Sender, r, 1)
-LF_DEFINE_REACTION_CTOR(Sender, r, 0)
+LF_DEFINE_REACTION_CTOR(Sender, r, 0, NULL, NEVER, NULL)
 LF_DEFINE_OUTPUT_STRUCT(Sender, out, 1, msg_t)
 LF_DEFINE_OUTPUT_CTOR(Sender, out, 1)
 
@@ -78,6 +78,9 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Sender, Receiver) {
   LF_INITIALIZE_FEDERATED_OUTPUT_CONNECTION(Sender, out, serialize_msg_t);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 1);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 1, 1);
+
 // Reactor main
 typedef struct {
   Reactor super;
@@ -87,6 +90,7 @@ typedef struct {
   LF_CHILD_OUTPUT_CONNECTIONS(sender, out, 1, 1, 1);
   LF_CHILD_OUTPUT_EFFECTS(sender, out, 1, 1, 0);
   LF_CHILD_OUTPUT_OBSERVERS(sender, out, 1, 1, 0);
+  FederateStartupCoordinator startup_coordinator;
 } MainSender;
 
 LF_REACTOR_CTOR_SIGNATURE(MainSender) {
@@ -95,10 +99,11 @@ LF_REACTOR_CTOR_SIGNATURE(MainSender) {
   LF_DEFINE_CHILD_OUTPUT_ARGS(sender, out, 1, 1);
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Sender, sender, 1, _sender_out_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Sender, Receiver);
-  lf_connect_federated_output(self->Sender_Receiver_bundle.outputs[0], self->sender->out);
+  lf_connect_federated_output(&self->Sender_Receiver_bundle.outputs[0]->super, &self->sender->out[0].super);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
 }
 
-LF_ENTRY_POINT_FEDERATED(MainSender, SEC(1), true, false, 1, true)
+LF_ENTRY_POINT_FEDERATED(MainSender,32,0,32, SEC(1), true, 1, true)
 
 int main() {
   lf_start();

examples/riot/blinky/Makefile

@@ -17,7 +17,5 @@ QUIET ?= 1
 
 # Enable reactor-uc features
 # CFLAGS += -DNETWORK_CHANNEL_TCP_POSIX
-REACTION_QUEUE_SIZE = 32
-EVENT_QUEUE_SIZE = 32
 
 include $(CURDIR)/../../../make/riot/riot.mk

examples/riot/coap_federated/receiver/Makefile

@@ -17,8 +17,6 @@ QUIET ?= 1
 
 # Enable reactor-uc features
 CFLAGS += -DNETWORK_CHANNEL_COAP
-REACTION_QUEUE_SIZE = 32
-EVENT_QUEUE_SIZE = 32
 
 CFLAGS += -DTHREAD_STACKSIZE_DEFAULT=10000
 CFLAGS += -DTHREAD_STACKSIZE_MAIN=10000

examples/riot/coap_federated/receiver/main.c

@@ -19,7 +19,7 @@ lf_ret_t deserialize_msg_t(void *user_struct, const unsigned char *msg_buf, size
 }
 
 LF_DEFINE_REACTION_STRUCT(Receiver, r, 0)
-LF_DEFINE_REACTION_CTOR(Receiver, r, 0)
+LF_DEFINE_REACTION_CTOR(Receiver, r, 0, NULL, NEVER, NULL)
 LF_DEFINE_INPUT_STRUCT(Receiver, in, 1, 0, lf_msg_t, 0)
 LF_DEFINE_INPUT_CTOR(Receiver, in, 1, 0, lf_msg_t, 0)
 
@@ -50,7 +50,7 @@ LF_REACTOR_CTOR_SIGNATURE_WITH_PARAMETERS(Receiver, InputExternalCtorArgs *in_ex
 }
 
 LF_DEFINE_FEDERATED_INPUT_CONNECTION_STRUCT(Receiver, in, lf_msg_t, 5);
-LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, lf_msg_t, 5, MSEC(100), false);
+LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, lf_msg_t, 5, MSEC(100), false, 0);
 
 typedef struct {
   FederatedConnectionBundle super;
@@ -66,12 +66,15 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Receiver, Sender) {
   LF_INITIALIZE_FEDERATED_INPUT_CONNECTION(Receiver, in, deserialize_msg_t);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 1);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 1, 1);
 typedef struct {
   Reactor super;
   LF_CHILD_REACTOR_INSTANCE(Receiver, receiver, 1);
   LF_FEDERATED_CONNECTION_BUNDLE_INSTANCE(Receiver, Sender);
   LF_FEDERATE_BOOKKEEPING_INSTANCES(1);
   LF_CHILD_INPUT_SOURCES(receiver, in, 1, 1, 0);
+  FederateStartupCoordinator startup_coordinator;
 } MainRecv;
 
 LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
@@ -80,10 +83,11 @@ LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
   LF_DEFINE_CHILD_INPUT_ARGS(receiver, in, 1, 1);
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Receiver, receiver, 1, _receiver_in_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Receiver, Sender);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
   lf_connect_federated_input(&self->Receiver_Sender_bundle.inputs[0]->super, &self->receiver->in[0].super);
 }
 
-LF_ENTRY_POINT_FEDERATED(MainRecv, SEC(1), true, true, 1, false)
+LF_ENTRY_POINT_FEDERATED(MainRecv, 32, 0, 32, SEC(1), true, 1, false)
 
 int main() {
   lf_start();

examples/riot/coap_federated/sender/Makefile

@@ -17,8 +17,6 @@ QUIET ?= 1
 
 # Enable reactor-uc features
 CFLAGS += -DNETWORK_CHANNEL_COAP
-REACTION_QUEUE_SIZE = 32
-EVENT_QUEUE_SIZE = 32
 
 CFLAGS += -DTHREAD_STACKSIZE_DEFAULT=10000
 CFLAGS += -DTHREAD_STACKSIZE_MAIN=10000

examples/riot/coap_federated/sender/main.c

@@ -21,7 +21,7 @@ int serialize_msg_t(const void *user_struct, size_t user_struct_size, unsigned c
 LF_DEFINE_TIMER_STRUCT(Sender, t, 1, 0)
 LF_DEFINE_TIMER_CTOR(Sender, t, 1, 0)
 LF_DEFINE_REACTION_STRUCT(Sender, r, 1)
-LF_DEFINE_REACTION_CTOR(Sender, r, 0)
+LF_DEFINE_REACTION_CTOR(Sender, r, 0, NULL, NEVER, NULL)
 LF_DEFINE_OUTPUT_STRUCT(Sender, out, 1, lf_msg_t)
 LF_DEFINE_OUTPUT_CTOR(Sender, out, 1)
 
@@ -73,6 +73,8 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Sender, Receiver) {
   LF_INITIALIZE_FEDERATED_OUTPUT_CONNECTION(Sender, out, serialize_msg_t);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 1);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 1, 1);
 // Reactor main
 typedef struct {
   Reactor super;
@@ -82,6 +84,7 @@ typedef struct {
   LF_CHILD_OUTPUT_CONNECTIONS(sender, out, 1, 1, 1);
   LF_CHILD_OUTPUT_EFFECTS(sender, out, 1, 1, 0);
   LF_CHILD_OUTPUT_OBSERVERS(sender, out, 1, 1, 0);
+  FederateStartupCoordinator startup_coordinator;
 } MainSender;
 
 LF_REACTOR_CTOR_SIGNATURE(MainSender) {
@@ -91,9 +94,10 @@ LF_REACTOR_CTOR_SIGNATURE(MainSender) {
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Sender, sender, 1, _sender_out_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Sender, Receiver);
   lf_connect_federated_output((Connection *)self->Sender_Receiver_bundle.outputs[0], (Port *)self->sender->out);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
 }
 
-LF_ENTRY_POINT_FEDERATED(MainSender, SEC(1), true, false, 1, true)
+LF_ENTRY_POINT_FEDERATED(MainSender, SEC(1), true, 1, true)
 
 int main() {
   lf_start();

examples/riot/hello/Makefile

@@ -17,7 +17,5 @@ QUIET ?= 1
 
 # Enable reactor-uc features
 # CFLAGS += -DNETWORK_CHANNEL_TCP_POSIX
-REACTION_QUEUE_SIZE = 32
-EVENT_QUEUE_SIZE = 32
 
 include $(CURDIR)/../../../make/riot/riot.mk

examples/zephyr/basic_federated/common/receiver.h

@@ -33,7 +33,7 @@ typedef struct {
 } msg_t;
 
 LF_DEFINE_REACTION_STRUCT(Receiver, r, 0);
-LF_DEFINE_REACTION_CTOR(Receiver, r, 0)
+LF_DEFINE_REACTION_CTOR(Receiver, r, 0, NULL, NEVER, NULL);
 
 LF_DEFINE_INPUT_STRUCT(Receiver, in, 1, 0, msg_t, 0)
 LF_DEFINE_INPUT_CTOR(Receiver, in, 1, 0, msg_t, 0)
@@ -65,7 +65,7 @@ LF_REACTOR_CTOR_SIGNATURE_WITH_PARAMETERS(Receiver, InputExternalCtorArgs *in_ex
 }
 
 LF_DEFINE_FEDERATED_INPUT_CONNECTION_STRUCT(Receiver, in, msg_t, 5);
-LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, msg_t, 5, MSEC(100), false);
+LF_DEFINE_FEDERATED_INPUT_CONNECTION_CTOR(Receiver, in, msg_t, 5, MSEC(100), false, 0);
 
 typedef struct {
   FederatedConnectionBundle super;
@@ -81,12 +81,15 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Receiver, Sender) {
   LF_INITIALIZE_FEDERATED_INPUT_CONNECTION(Receiver, in, deserialize_payload_default);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 1);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 1, 1);
 typedef struct {
   Reactor super;
   LF_CHILD_REACTOR_INSTANCE(Receiver, receiver, 1);
   LF_FEDERATED_CONNECTION_BUNDLE_INSTANCE(Receiver, Sender);
   LF_FEDERATE_BOOKKEEPING_INSTANCES(1);
   LF_CHILD_INPUT_SOURCES(receiver, in, 1, 1, 0);
+  FederateStartupCoordinator startup_coordinator;
 } MainRecv;
 
 LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
@@ -95,6 +98,7 @@ LF_REACTOR_CTOR_SIGNATURE(MainRecv) {
   LF_DEFINE_CHILD_INPUT_ARGS(receiver, in, 1, 1);
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Receiver, receiver, 1, _receiver_in_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Receiver, Sender);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
   lf_connect_federated_input(&self->Receiver_Sender_bundle.inputs[0]->super, &self->receiver->in[0].super);
 }
-LF_ENTRY_POINT_FEDERATED(MainRecv, FOREVER, true, true, 1, false)
+LF_ENTRY_POINT_FEDERATED(MainRecv,32,0,32, FOREVER, true, 1, false)

examples/zephyr/basic_federated/federated_sender/src/sender.c

@@ -24,7 +24,7 @@ typedef struct {
 LF_DEFINE_ACTION_STRUCT(Sender, act, PHYSICAL_ACTION, 1, 0, 0, 10, bool);
 LF_DEFINE_ACTION_CTOR(Sender, act, PHYSICAL_ACTION, 1, 0, 0, 10, bool);
 LF_DEFINE_REACTION_STRUCT(Sender, r, 1);
-LF_DEFINE_REACTION_CTOR(Sender, r, 0);
+LF_DEFINE_REACTION_CTOR(Sender, r, 0, NULL, NEVER, NULL);
 
 LF_DEFINE_OUTPUT_STRUCT(Sender, out, 1, msg_t)
 LF_DEFINE_OUTPUT_CTOR(Sender, out, 1)
@@ -132,6 +132,8 @@ LF_FEDERATED_CONNECTION_BUNDLE_CTOR_SIGNATURE(Sender, Receiver2) {
   LF_INITIALIZE_FEDERATED_OUTPUT_CONNECTION(Sender, out, serialize_payload_default);
 }
 
+LF_DEFINE_STARTUP_COORDINATOR_STRUCT(Federate, 2);
+LF_DEFINE_STARTUP_COORDINATOR_CTOR(Federate, 2, 1);
 // Reactor main
 typedef struct {
   Reactor super;
@@ -142,6 +144,7 @@ typedef struct {
   LF_CHILD_OUTPUT_EFFECTS(sender, out, 1, 1, 0);
   LF_CHILD_OUTPUT_OBSERVERS(sender, out,1, 1, 0);
   LF_FEDERATE_BOOKKEEPING_INSTANCES(2);
+  FederateStartupCoordinator startup_coordinator;
 } MainSender;
 
 LF_REACTOR_CTOR_SIGNATURE(MainSender) {
@@ -152,12 +155,13 @@ LF_REACTOR_CTOR_SIGNATURE(MainSender) {
   LF_INITIALIZE_CHILD_REACTOR_WITH_PARAMETERS(Sender, sender, 1, _sender_out_args[i]);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Sender, Receiver1);
   LF_INITIALIZE_FEDERATED_CONNECTION_BUNDLE(Sender, Receiver2);
+  LF_INITIALIZE_STARTUP_COORDINATOR(Federate);
 
   lf_connect_federated_output(self->Sender_Receiver1_bundle.outputs[0], self->sender->out);
   lf_connect_federated_output(self->Sender_Receiver2_bundle.outputs[0], self->sender->out);
 }
 
-LF_ENTRY_POINT_FEDERATED(MainSender, FOREVER, true, true, 2, true)
+LF_ENTRY_POINT_FEDERATED(MainSender,32,0,32, FOREVER, true, 2, true)
 
 int main() {
   setup_button();