Merge pull request #2243 from lf-lang/include-clock-sync

Include clock sync for federated programs on multiple platforms.

core/src/main/java/org/lflang/federated/extensions/CExtension.java

@@ -499,8 +499,8 @@ protected final void writePreambleFile(
   }
 
   /**
-   * Add preamble to a separate file to set up federated execution. Return an empty string since no
-   * code generated needs to go in the source.
+   * Add preamble to a separate file to set up federated execution. Return an a string containing
+   * the #includes that are needed by the federate.
    */
   @Override
   public String generatePreamble(
@@ -539,6 +539,7 @@ protected String makePreamble(
     code.pr("#include \"core/federated/federate.h\"");
     code.pr("#include \"core/federated/network/net_common.h\"");
     code.pr("#include \"core/federated/network/net_util.h\"");
+    code.pr("#include \"core/federated/clock-sync.h\"");
     code.pr("#include \"core/threaded/reactor_threaded.h\"");
     code.pr("#include \"core/utils/util.h\"");
     code.pr("extern federate_instance_t _fed;");

core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java

@@ -389,7 +389,11 @@ private String getRemoteLaunchCode(
         "ssh " + target + " 'mkdir -p log; \\",
         "    echo \"-------------- Federation ID: \"'$FEDERATION_ID' >> " + logFileName + "; \\",
         "    date >> " + logFileName + "; \\",
-        "    echo \"Executing RTI: " + rtiLaunchString + "\" 2>&1 | tee -a " + logFileName + "; \\",
+        "    echo \"Executing RTI: "
+            + rtiLaunchString
+            + "\n\" 2>&1 | tee -a "
+            + logFileName
+            + "; \\",
         "    # First, check if the RTI is on the PATH",
         "    if ! command -v RTI &> /dev/null",
         "    then",