Merge branch 'shutdown' of github.com:lf-lang/lingua-franca into netw…

…orkdriver
lf-lang · Mar 6, 2025 · f104a01 · f104a01
2 parents ea32f93 + 26c2412
commit f104a01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtension.java b/core/src/main/java/org/lflang/federated/extensions/CExtension.java
@@ -687,8 +687,7 @@ private String generateCodeToInitializeFederate(
             "\n",
             "// Initialize the socket mutexes",
             "lf_mutex_init(&lf_outbound_netchan_mutex);",
-            "lf_mutex_init(&lf_inbound_netchan_mutex);",
-            "lf_mutex_init(&shutdown_mutex);",
+            "init_shutdown_mutex();",
             "lf_cond_init(&lf_port_status_changed, &env->mutex);"));
 
     // Find the STA (A.K.A. the global STP offset) for this federate.

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
+1 −3		core/federated/RTI/rti_remote.c
+18 −18		core/federated/federate.c
+1 −6		include/core/federated/federate.h
+5 −5		network/api/socket_common.h
+2 −0		network/impl/src/socket_common.c