From 52174f7388d49c078f5a4ad6062da7ca06ca4392 Mon Sep 17 00:00:00 2001 From: Dongha Kim Date: Mon, 16 Dec 2024 11:39:30 -0700 Subject: [PATCH 1/5] Add code generate to include socket_common.h --- .../main/java/org/lflang/federated/extensions/CExtension.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java index edf5bc8d19..12edb2e693 100644 --- 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\""); From fa36c386e40aa381a233fb6c9a3acf1c189010a8 Mon Sep 17 00:00:00 2001 From: Dongha Kim Date: Mon, 16 Dec 2024 13:55:57 -0700 Subject: [PATCH 2/5] Revert "Align reactor-c" This reverts commit e546fc912c27014e8053b202804ac97375a299bc. --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 3e6303113c..7acd2f9618 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 3e6303113c2cc9328264418858344665060661a6 +Subproject commit 7acd2f9618d2e983749cdcf66e990c993372d5b8 From 45c525c88e93659240d760f425d2891d1d64f56a Mon Sep 17 00:00:00 2001 From: Dongha Kim Date: Tue, 17 Dec 2024 10:05:52 -0700 Subject: [PATCH 3/5] Update submodule --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 7acd2f9618..ec84cb5723 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 7acd2f9618d2e983749cdcf66e990c993372d5b8 +Subproject commit ec84cb5723b7101466ace9b0e484ddd206bdcdb0 From 4c3743df747b2cd8ad173287c150663b28c18476 Mon Sep 17 00:00:00 2001 From: Dongha Kim Date: Tue, 17 Dec 2024 18:53:24 -0700 Subject: [PATCH 4/5] Update reactor-c --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index ec84cb5723..4860623ab0 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit ec84cb5723b7101466ace9b0e484ddd206bdcdb0 +Subproject commit 4860623ab0a4fd9e00bd7db712ab171c20abfdde From fae5b1b835d3d55bd69d89117301d3f7888d79fa Mon Sep 17 00:00:00 2001 From: Hokeun Kim Date: Fri, 27 Dec 2024 18:26:42 -0700 Subject: [PATCH 5/5] Set reactor-c submodule pointer to the recently merged PR https://github.com/lf-lang/reactor-c/pull/505 --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 793fc9a623..03137a0295 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 793fc9a62378624e39ec52499dbae174146fe1ba +Subproject commit 03137a029588e5eec364f3f1d6c2ab99a22f66de