merge with main

Author: tanneberger

include/reactor-uc/macros_internal.h

@@ -509,7 +509,7 @@ typedef struct FederatedOutputConnection FederatedOutputConnection;
   void ReactorName##_ctor(ReactorName *self, Reactor *parent, Environment *env, __VA_ARGS__)
 
 #define LF_FEDERATED_CONNECTION_BUNDLE_CALL_CTOR()                                                                     \
-  FederatedConnectionBundle_ctor(&self->super, parent, &self->channel.super, &self->inputs[0],                         \
+  FederatedConnectionBundle_ctor(&self->super, parent, (NetworkChannel *)&self->channel.super, &self->inputs[0],       \
                                  self->deserialize_hooks, sizeof(self->inputs) / sizeof(self->inputs[0]),              \
                                  &self->outputs[0], self->serialize_hooks,                                             \
                                  sizeof(self->outputs) / sizeof(self->outputs[0]), index);

include/reactor-uc/startup_coordinator.h

@@ -12,18 +12,24 @@ typedef struct Environment Environment;
 typedef enum JoiningPolicy JoiningPolicy;
 typedef struct TimerConfig TimerConfig;
 
-enum JoiningPolicy { JOIN_IMMEDIATELY = 0, JOIN_ALIGNED_WITH_SHORT_TIMER = 1, JOIN_AT_HYPER_PERIOD = 2 };
+enum JoiningPolicy { JOIN_IMMEDIATELY = 0, JOIN_TIMER_ALIGNED = 1, JOIN_AT_HYPER_PERIOD = 2 };
 
 /** Represents the state of a neighbor. */
 typedef struct {
-  bool core_federate;                   // Whether this federate can be not available
-  bool handshake_response_received;     // Whether a handshake response has been received from this neighbor.
-  bool handshake_request_received;      // Whether a handshake response has been sent to this neighbor.
-  bool handshake_response_sent;         // Whether a handshake response has been sent to this neighbor.
-  size_t start_time_proposals_received; // The number of start time proposals received from this neighbor.
-  StartupCoordinationState initial_state_of_neighbor; // Saves the initial state of the neighbor
-  interval_t
-      current_logical_time; // Used by transient to figure out the current logical times of all neighboring federates
+  /**True, if this federate needs to be present during joining*/
+  bool core_federate;
+  /** True, if a handshake response has been received from this neighbor.*/
+  bool handshake_response_received;
+  /** True, if a handshake response has been sent to this neighbor.*/
+  bool handshake_request_received;
+  /** True, if a handshake response has been sent to this neighbor.*/
+  bool handshake_response_sent;
+  /** The number of start time proposals received from this neighbor.*/
+  size_t start_time_proposals_received;
+  /** Saves the initial state of the neighbor.*/
+  StartupCoordinationState initial_state_of_neighbor;
+  /** Used by transient federates, to figure out the current logical times of all neighboring federates. */
+  interval_t current_logical_time;
 } NeighborState;
 
 /** The payload of a StartupCoordinator event. */

lfc/core/src/main/kotlin/org/lflang/generator/uc/federated/UcStartupCoordinatorGenerator.kt

@@ -23,6 +23,27 @@ fun JoiningPolicy.toCString() =
       else -> throw IllegalArgumentException("Joining policy not handled")
     }
 
+enum class JoiningPolicy {
+  JOIN_IMMEDIATELY,
+  JOIN_TIMER_ALIGNED;
+
+  companion object {
+    fun parse(str: String): JoiningPolicy =
+        when (str) {
+          "\"JOIN_IMMEDIATELY\"" -> JOIN_IMMEDIATELY
+          "\"JOIN_TIMER_ALIGNED\"" -> JOIN_TIMER_ALIGNED
+          else -> throw IllegalArgumentException("Unknown joining policy: $str")
+        }
+  }
+}
+
+fun JoiningPolicy.toCString() =
+    when (this) {
+      JoiningPolicy.JOIN_IMMEDIATELY -> "JOIN_IMMEDIATELY"
+      JoiningPolicy.JOIN_TIMER_ALIGNED -> "JOIN_TIMER_ALIGNED"
+      else -> throw IllegalArgumentException("Joining policy not handled")
+    }
+
 class UcStartupCoordinatorGenerator(
     private val federate: UcFederate,
     private val connectionGenerator: UcConnectionGenerator,

src/startup_coordinator.c

@@ -9,6 +9,10 @@
 #define NEIGHBOR_INDEX_SELF -1
 #define NUM_RESERVED_EVENTS 3 // 3 events is reserved for scheduling our own events.
 
+#ifndef TRANSIENT_WAIT_TIME
+#define TRANSIENT_WAIT_TIME MSEC(250)
+#endif
+
 /**
  * @brief Open connections to all neighbors. This function will block until all connections are established.
  */
@@ -298,6 +302,7 @@ static void StartupCoordinator_handle_start_time_proposal(StartupCoordinator *se
     case StartupCoordinationState_RUNNING:
       // Should not be possible.
       validate(false);
+      break;
     case StartupCoordinationState_HANDSHAKING:
       // This is possible. Our node might be still handshaking with another neighbor.
       // Intentional fall-through