Merge pull request #292 from lf-lang/network-structure

Make new directory under `federated` named `network`
lf-lang · Dec 2, 2023 · b32b39d · b32b39d
2 parents 1cd699d + 812e403
commit b32b39d
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,7 @@ set(PlatformLib platform)
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_SOURCE_DIR}/include/core)
 include_directories(${CMAKE_SOURCE_DIR}/include/core/federated)
+include_directories(${CMAKE_SOURCE_DIR}/include/core/federated/network)
 include_directories(${CMAKE_SOURCE_DIR}/include/core/modal_models)
 include_directories(${CMAKE_SOURCE_DIR}/include/core/platform)
 include_directories(${CMAKE_SOURCE_DIR}/include/core/threaded)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(core ${GENERAL_SOURCES})
 # Add sources for either threaded or single-threaded runtime
 if (DEFINED FEDERATED)
     include(federated/CMakeLists.txt)
+    include(federated/network/CMakeLists.txt)
 endif()
 
 # Add sources for either threaded or single-threaded runtime
@@ -43,13 +44,15 @@ include(utils/CMakeLists.txt)
 include(modal_models/CMakeLists.txt)
 include(platform/CMakeLists.txt)
 
+
 # Print sources used for compilation
 list(JOIN INFO_SOURCES ", " PRINTABLE_SOURCE_LIST)
 message(STATUS "Including the following sources: " ${PRINTABLE_SOURCE_LIST})
 
 target_include_directories(core PUBLIC ../include)
 target_include_directories(core PUBLIC ../include/core)
 target_include_directories(core PUBLIC ../include/core/federated)
+target_include_directories(core PUBLIC ../include/core/federated/network)
 target_include_directories(core PUBLIC ../include/core/platform)
 target_include_directories(core PUBLIC ../include/core/modal_models)
 target_include_directories(core PUBLIC ../include/core/threaded)

diff --git a/core/federated/CMakeLists.txt b/core/federated/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(FEDERATED_SOURCES clock-sync.c federate.c net_util.c)
+set(FEDERATED_SOURCES clock-sync.c federate.c)
 list(APPEND INFO_SOURCES ${FEDERATED_SOURCES})
 
 list(TRANSFORM FEDERATED_SOURCES PREPEND federated/)

diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt
@@ -52,6 +52,7 @@ endif()
 set(IncludeDir ../../../include/core)
 include_directories(${IncludeDir})
 include_directories(${IncludeDir}/federated)
+include_directories(${IncludeDir}/federated/network)
 include_directories(${IncludeDir}/modal_models)
 include_directories(${IncludeDir}/platform)
 include_directories(${IncludeDir}/utils)
@@ -68,7 +69,7 @@ add_executable(
     ${CoreLib}/platform/lf_unix_clock_support.c
     ${CoreLib}/utils/util.c
     ${CoreLib}/tag.c
-    ${CoreLib}/federated/net_util.c
+    ${CoreLib}/federated/network/net_util.c
     ${CoreLib}/utils/pqueue_base.c
     ${CoreLib}/utils/pqueue_tag.c
     ${CoreLib}/utils/pqueue.c

diff --git a/core/federated/network/CMakeLists.txt b/core/federated/network/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(LF_NETWORK_FILES net_util.c)
+list(APPEND INFO_SOURCES ${LF_NETWORK_FILES})
+
+list(TRANSFORM LF_NETWORK_FILES PREPEND federated/network/)
+target_sources(core PRIVATE ${LF_NETWORK_FILES})
diff --git a/core/federated/net_util.c → core/federated/network/net_util.c b/core/federated/net_util.c → core/federated/network/net_util.c
diff --git a/include/core/federated/net_common.h → include/core/federated/network/net_common.h b/include/core/federated/net_common.h → include/core/federated/network/net_common.h
diff --git a/include/core/federated/net_util.h → include/core/federated/network/net_util.h b/include/core/federated/net_util.h → include/core/federated/network/net_util.h
@@ -48,8 +48,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include "../platform.h"
-#include "../tag.h"
+#include "../../platform.h"
+#include "../../tag.h"
 
 #define HOST_LITTLE_ENDIAN 1
 #define HOST_BIG_ENDIAN 2

diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt
@@ -1 +1 @@
-master
+network-structure