Merge branch 'master' into reactor-names

lf-lang · Dec 28, 2024 · 7c45b31 · 7c45b31
2 parents bfcd8da + c794669
commit 7c45b31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -520,6 +520,7 @@ public String generatePreamble(
     includes.pr("#include \"core/federated/federate.h\"");
     includes.pr("#include \"core/federated/network/net_common.h\"");
     includes.pr("#include \"core/federated/network/net_util.h\"");
+    includes.pr("#include \"core/federated/network/socket_common.h\"");
     includes.pr("#include \"core/federated/clock-sync.h\"");
     includes.pr("#include \"core/threaded/reactor_threaded.h\"");
     includes.pr("#include \"core/utils/util.h\"");
@@ -542,6 +543,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/network/socket_common.h\"");
     code.pr("#include \"core/federated/clock-sync.h\"");
     code.pr("#include \"core/threaded/reactor_threaded.h\"");
     code.pr("#include \"core/utils/util.h\"");

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
+1 −0		core/federated/RTI/CMakeLists.txt
+21 −161		core/federated/RTI/rti_remote.c
+2 −3		core/federated/RTI/rti_remote.h
+1 −0		core/federated/clock-sync.c
+64 −232		core/federated/federate.c
+1 −1		core/federated/network/CMakeLists.txt
+0 −178		core/federated/network/net_util.c
+404 −0		core/federated/network/socket_common.c
+0 −53		include/core/federated/network/net_common.h
+3 −121		include/core/federated/network/net_util.h
+243 −0		include/core/federated/network/socket_common.h