formatting

Author: tanneberger

include/reactor-uc/macros_internal.h

@@ -562,7 +562,7 @@ typedef struct FederatedInputConnection FederatedInputConnection;
 #define LF_DEFINE_STARTUP_COORDINATOR_CTOR(ReactorName, NumNeighbors, LongestPath, NumEvents, JoiningPolicy)           \
   void ReactorName##StartupCoordinator_ctor(ReactorName##StartupCoordinator *self, Environment *env) {                 \
     StartupCoordinator_ctor(&self->super, env, self->neighbors, NumNeighbors, LongestPath, JoiningPolicy,              \
-                            sizeof(StartupEvent), (void *)self->events, self->used, (NumEvents));        \
+                            sizeof(StartupEvent), (void *)self->events, self->used, (NumEvents));                      \
   }
 
 #define LF_DEFINE_STARTUP_COORDINATOR(ReactorName) ReactorName##StartupCoordinator startup_coordinator;

include/reactor-uc/startup_coordinator.h

@@ -21,7 +21,8 @@ typedef struct {
   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
+  interval_t
+      current_logical_time; // Used by transient to figure out the current logical times of all neighboring federates
 } NeighborState;
 
 /** The payload of a StartupCoordinator event. */

lfc/core/src/main/java/org/lflang/AttributeUtils.java

@@ -292,7 +292,7 @@ public static List<Attribute> getInterfaceAttributes(Instantiation node) {
   }
 
   public static Attribute getJoiningPolicy(Instantiation node) {
-     return findAttributeByName(node, "joining_policy");
+    return findAttributeByName(node, "joining_policy");
   }
 
   public static int getMaxNumberOfPendingEvents(Action node) {

lfc/core/src/main/java/org/lflang/validation/AttributeSpec.java

@@ -294,11 +294,8 @@ enum AttrParamType {
                 new AttrParamSpec("args", AttrParamType.STRING, true),
                 new AttrParamSpec("include", AttrParamType.STRING, false))));
     ATTRIBUTE_SPECS_BY_NAME.put(
-            "joining_policy",
-            new AttributeSpec(List.of(
-                    new AttrParamSpec("policy", AttrParamType.STRING, false)
-            ))
-    );
+        "joining_policy",
+        new AttributeSpec(List.of(new AttrParamSpec("policy", AttrParamType.STRING, false))));
     // @link(type="string", server_port=int, server_side="string", args="string") e.g.
     // @link(type="TcpIp", server_port=1042)
     ATTRIBUTE_SPECS_BY_NAME.put(

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

@@ -30,13 +30,12 @@ class UcFederate(val inst: Instantiation, val bankIdx: Int) {
   }
 
   fun getInterface(name: String): UcNetworkInterface = interfaces.find { it.name == name }!!
+
   fun getJoiningPolicy(): JoiningPolicy {
-    val attr: Attribute? = AttributeUtils.getJoiningPolicy(inst);
-    return attr?.let {
-      JoiningPolicy.parse(it.getAttrParms().get(0).getValue())
-    }.run {
-      JoiningPolicy.IMMEDIATELY
-    };
+    val attr: Attribute? = AttributeUtils.getJoiningPolicy(inst)
+    return attr
+        ?.let { JoiningPolicy.parse(it.getAttrParms().get(0).getValue()) }
+        .run { JoiningPolicy.IMMEDIATELY }
   }
 
   fun getDefaultInterface(): UcNetworkInterface = interfaces.first()

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

@@ -24,7 +24,9 @@ class UcFederateGenerator(
           container, parameters, ports, connections, reactions, fileConfig, messageReporter)
   private val clockSync = UcClockSyncGenerator(currentFederate, connections, targetConfig)
 
-  private val startupCooordinator = UcStartupCoordinatorGenerator(currentFederate, connections, currentFederate.getJoiningPolicy())
+  private val startupCooordinator =
+      UcStartupCoordinatorGenerator(
+          currentFederate, connections, currentFederate.getJoiningPolicy())
   private val headerFile = "lf_federate.h"
   private val includeGuard = "LFC_GEN_FEDERATE_${currentFederate.inst.name.uppercase()}_H"
 

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

@@ -8,19 +8,21 @@ enum class JoiningPolicy {
   TIMER_ALIGNED;
 
   companion object {
-      fun parse(str: String): JoiningPolicy = when(str) {
+    fun parse(str: String): JoiningPolicy =
+        when (str) {
           "IMMEDIATELY" -> JoiningPolicy.IMMEDIATELY
           "TIMER_ALIGNED" -> JoiningPolicy.TIMER_ALIGNED
           else -> throw IllegalArgumentException("Invalid Joining policy specified")
-      }
+        }
   }
 }
 
-fun JoiningPolicy.toCString() = when(this) {
-    JoiningPolicy.IMMEDIATELY -> "JOIN_IMMEDIATELY"
-    JoiningPolicy.TIMER_ALIGNED -> "JOIN_INDIVIDUAL_TIMER_ALIGNED"
-    else -> throw IllegalArgumentException("Joining policy not handled")
-}
+fun JoiningPolicy.toCString() =
+    when (this) {
+      JoiningPolicy.IMMEDIATELY -> "JOIN_IMMEDIATELY"
+      JoiningPolicy.TIMER_ALIGNED -> "JOIN_INDIVIDUAL_TIMER_ALIGNED"
+      else -> throw IllegalArgumentException("Joining policy not handled")
+    }
 
 class UcStartupCoordinatorGenerator(
     private val federate: UcFederate,
@@ -51,12 +53,12 @@ class UcStartupCoordinatorGenerator(
 
     val instName = "startup_coordinator"
   }
+
   private val numNeighbors = connectionGenerator.getNumFederatedConnectionBundles()
   private val numSystemEvents = getNumSystemEvents(numNeighbors)
   private val longestPath = connectionGenerator.getLongestFederatePath()
   private val typeName = "Federate"
 
-
   fun generateSelfStruct() =
       "LF_DEFINE_STARTUP_COORDINATOR_STRUCT(${typeName}, ${numNeighbors}, ${numSystemEvents})"
 

src/schedulers/dynamic/scheduler.c

@@ -227,8 +227,6 @@ void Scheduler_do_shutdown(Scheduler *untyped_self, tag_t shutdown_tag) {
   }
 }
 
-
-
 void Scheduler_set_and_schedule_start_tag(Scheduler *untyped_self, instant_t start_time) {
   DynamicScheduler *self = (DynamicScheduler *)untyped_self;
 

src/startup_coordinator.c

@@ -84,7 +84,8 @@ void StartupCoordinator_schedule_timers(StartupCoordinator *self, const Reactor
   }
 }
 
-void StartupCoordinator_schedule_timers_joining(StartupCoordinator* self, Reactor* reactor, interval_t federation_start_time, interval_t join_time) {
+void StartupCoordinator_schedule_timers_joining(StartupCoordinator *self, Reactor *reactor,
+                                                interval_t federation_start_time, interval_t join_time) {
   lf_ret_t ret;
   for (size_t i = 0; i < reactor->triggers_size; i++) {
     Trigger *trigger = reactor->triggers[i];
@@ -377,7 +378,7 @@ static void StartupCoordinator_handle_start_time_proposal(StartupCoordinator *se
 }
 
 static void StartupCoordinator_handle_start_time_request(StartupCoordinator *self, StartupEvent *payload) {
-  FederatedEnvironment* env = (FederatedEnvironment*)self->env;
+  FederatedEnvironment *env = (FederatedEnvironment *)self->env;
   if (payload->neighbor_index == NEIGHBOR_INDEX_SELF) {
     for (size_t i = 0; i < self->num_neighbours; i++) {
       NetworkChannel *chan = env->net_bundles[i]->net_channel;
@@ -390,7 +391,7 @@ static void StartupCoordinator_handle_start_time_request(StartupCoordinator *sel
 
       // We now schedule a system event here, because otherwise we will never detect no other federates responding
       StartupCoordinator_schedule_system_self_event(self, self->env->get_physical_time(self->env) + MSEC(250),
-                                                StartupCoordination_start_time_response_tag);
+                                                    StartupCoordination_start_time_response_tag);
     }
 
   } else {
@@ -404,18 +405,16 @@ static void StartupCoordinator_handle_start_time_request(StartupCoordinator *sel
           self->env->get_elapsed_logical_time(self->env);
       msg->message.startup_coordination.message.start_time_response.federation_start_time = self->start_time_proposal;
       chan->send_blocking(chan, msg);
-        LF_INFO(FED, "SENDING TIME start_tag: " PRINTF_TIME " elapsed_time: " PRINTF_TIME,
-          msg->message.startup_coordination.message.start_time_response.federation_start_time,
-          msg->message.startup_coordination.message.start_time_response.elapsed_logical_time);
+      LF_INFO(FED, "SENDING TIME start_tag: " PRINTF_TIME " elapsed_time: " PRINTF_TIME,
+              msg->message.startup_coordination.message.start_time_response.federation_start_time,
+              msg->message.startup_coordination.message.start_time_response.elapsed_logical_time);
       break;
     }
     default:;
     }
   }
 }
 
-
-
 static void StartupCoordinator_handle_start_time_response(StartupCoordinator *self, StartupEvent *payload) {
   if (self->start_time_proposal > 0) {
     return;
@@ -462,23 +461,23 @@ static void StartupCoordinator_handle_start_time_response(StartupCoordinator *se
   instant_t joining_time = 0;
 
   if (self->joining_policy == JOIN_IMMEDIATELY) {
-      joining_time = max_logical_time + MSEC(50);
-      tag_t start_tag = {.time = joining_time, .microstep = 0};
-      LF_INFO(FED, "Policy: IMMEDIATELY Scheduling join_time: " PRINTF_TIME, joining_time);
-      self->env->scheduler->prepare_timestep(self->env->scheduler, NEVER_TAG);
-      StartupCoordinator_schedule_startups(self, start_tag);
-      StartupCoordinator_schedule_timers(self, self->env->main, start_tag);
-      self->env->scheduler->prepare_timestep(self->env->scheduler, start_tag);
-      self->env->scheduler->set_and_schedule_start_tag(self->env->scheduler, joining_time);
+    joining_time = max_logical_time + MSEC(50);
+    tag_t start_tag = {.time = joining_time, .microstep = 0};
+    LF_INFO(FED, "Policy: IMMEDIATELY Scheduling join_time: " PRINTF_TIME, joining_time);
+    self->env->scheduler->prepare_timestep(self->env->scheduler, NEVER_TAG);
+    StartupCoordinator_schedule_startups(self, start_tag);
+    StartupCoordinator_schedule_timers(self, self->env->main, start_tag);
+    self->env->scheduler->prepare_timestep(self->env->scheduler, start_tag);
+    self->env->scheduler->set_and_schedule_start_tag(self->env->scheduler, joining_time);
   } else if (self->joining_policy == JOIN_ALIGNED_WITH_SHORT_TIMER) {
-      joining_time = max_logical_time + MSEC(50);
-      tag_t start_tag = {.time = joining_time, .microstep = 0};
-      LF_INFO(FED, "Policy: Timer Aligned Scheduling join_time: " PRINTF_TIME, joining_time);
-      self->env->scheduler->prepare_timestep(self->env->scheduler, NEVER_TAG);
-      StartupCoordinator_schedule_startups(self, start_tag);
-      StartupCoordinator_schedule_timers_joining(self, self->env->main, start_time, joining_time);
-      self->env->scheduler->prepare_timestep(self->env->scheduler, start_tag);
-      self->env->scheduler->set_and_schedule_start_tag(self->env->scheduler, joining_time);
+    joining_time = max_logical_time + MSEC(50);
+    tag_t start_tag = {.time = joining_time, .microstep = 0};
+    LF_INFO(FED, "Policy: Timer Aligned Scheduling join_time: " PRINTF_TIME, joining_time);
+    self->env->scheduler->prepare_timestep(self->env->scheduler, NEVER_TAG);
+    StartupCoordinator_schedule_startups(self, start_tag);
+    StartupCoordinator_schedule_timers_joining(self, self->env->main, start_time, joining_time);
+    self->env->scheduler->prepare_timestep(self->env->scheduler, start_tag);
+    self->env->scheduler->set_and_schedule_start_tag(self->env->scheduler, joining_time);
   } else {
     validate(false);
   }
@@ -516,9 +515,8 @@ static void StartupCoordinator_handle_system_event(SystemEventHandler *_self, Sy
 
   case StartupCoordination_joining_time_announcement_tag:
     LF_INFO(FED, "Handle: Announcement of Joining Tag");
-    //TODO: here we then need to set the last message tag on all input ports connected to this transient federate
+    // TODO: here we then need to set the last message tag on all input ports connected to this transient federate
     break;
-
   }
 
   _self->payload_pool.free(&_self->payload_pool, event->super.payload);

test/unit/request_shutdown_test.c

@@ -32,4 +32,4 @@ int main() {
   UNITY_BEGIN();
   RUN_TEST(test_run);
   return UNITY_END();
-}
+}