Removal of .c file includes in federated programs

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

@@ -98,14 +98,6 @@ public void initializeTargetConfig(
 
         generateCMakeInclude(federate, fileConfig);
 
-        federate.targetConfig.fileNames.add("include/federated");
-        federate.targetConfig.setByUser.add(TargetProperty.FILES);
-        FileUtil.copyDirectoryFromClassPath(
-            "/lib/c/reactor-c/core/federated",
-            fileConfig.getSrcPath().resolve("include" + File.separator + "federated"),
-            true
-        );
-
         federate.targetConfig.keepalive = true;
         federate.targetConfig.setByUser.add(TargetProperty.KEEPALIVE);
 
@@ -117,7 +109,7 @@ public void initializeTargetConfig(
         federate.targetConfig.setByUser.add(TargetProperty.THREADING);
 
         // Include the fed setup file for this federate in the target property
-        String relPath = "include" + File.separator + "_" + federate.name + "_preamble.c";
+        String relPath = "include" + File.separator + "_" + federate.name + "_preamble.h";
         federate.targetConfig.fedSetupPreamble = relPath;
         federate.targetConfig.setByUser.add(TargetProperty.FED_SETUP);
     }
@@ -489,7 +481,7 @@ public String getNetworkBufferType() {
     }
 
     /**
-     * Add preamble to a separate file `include/_federateName_preamble.c` to set up federated execution.
+     * Add preamble to a separate file `include/_federateName_preamble.h` to set up federated execution.
      * Return an empty string since no code generated needs to go in the source.
      */
     @Override
@@ -499,9 +491,9 @@ public String generatePreamble(
         LinkedHashMap<String, Object> federationRTIProperties,
         ErrorReporter errorReporter
     ) throws IOException {
-        // Put the C preamble in a `include/_federate.name + _preamble.c` file
+        // Put the C preamble in a `include/_federate.name + _preamble.h` file
         String cPreamble = makePreamble(federate, fileConfig, federationRTIProperties, errorReporter);
-        String relPath = "include" + File.separator + "_" + federate.name + "_preamble.c";
+        String relPath = "include" + File.separator + "_" + federate.name + "_preamble.h";
         Path fedPreamblePath = fileConfig.getSrcPath().resolve(relPath);
         Files.createDirectories(fedPreamblePath.getParent());
         try (var writer = Files.newBufferedWriter(fedPreamblePath)) {
@@ -522,7 +514,12 @@ protected String makePreamble(
 
         var code = new CodeBuilder();
 
-        code.pr("#include \"../federated/federate.c\"");
+        code.pr("#include \"core/federated/federate.h\"");
+        code.pr("#include \"core/federated/net_common.h\"");
+        code.pr("#include \"core/federated/net_util.h\"");
+        code.pr("#include \"core/threaded/reactor_threaded.h\"");
+        code.pr("#include \"core/utils/util.h\"");
+        code.pr("extern federate_instance_t _fed;");
 
         // Generate function to return a pointer to the action trigger_t
         // that handles incoming network messages destined to the specified
@@ -552,7 +549,7 @@ protected String generateSerializationPreamble(FederateInstance federate, FedFil
     }
 
     /**
-     * Create a macro that initializes necessary triggers for federated execution,
+     * Create a function that initializes necessary triggers for federated execution,
      * which are the triggers for control reactions and references to all network
      * actions (which are triggered upon receiving network messages).
      *
@@ -571,13 +568,14 @@ private String generateInitializeTriggers(FederateInstance federate, ErrorReport
         code.pr(CExtensionUtils.initializeTriggersForNetworkActions(federate, main));
         code.pr(CExtensionUtils.initializeTriggerForControlReactions(main, main, federate));
         federatedReactor.setName(oldFederatedReactorName);
+
         return """
-        #define initialize_triggers_for_federate() \\
-        do { \\
-        %s
-        } \\
-        while (0)
-        """.formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
+            #define initialize_triggers_for_federate() \\
+            do { \\
+            %s
+            } \\
+            while (0)
+            """.formatted((code.getCode().isBlank() ? "\\" : code.getCode()).indent(4).stripTrailing());
     }
 
     /**

org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java

@@ -61,6 +61,10 @@ public static String generateIncludeStatements(
         code.pr("#include \"" + relPathHeader + "core/mixed_radix.h\"");
         code.pr("#include \"" + relPathHeader + "core/port.h\"");
         code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
+        if(targetConfig.fedSetupPreamble != null) {
+            code.pr("#include \"" + relPathHeader + "core/federated/federate.h\"");
+            code.pr("#include \"" + relPathHeader + "core/federated/net_common.h\"");
+        }
         if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
             code.pr("}");
         }