From 437de9e5aa726f8f313681c64a14a7434bf42661 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:06:56 -0700 Subject: [PATCH 01/25] Change file structure --- core/federated/RTI/CMakeLists.txt | 2 +- core/federated/networks/CMakeLists.txt | 5 +++++ core/federated/{ => networks}/net_util.c | 0 include/core/federated/{ => networks}/net_common.h | 0 include/core/federated/{ => networks}/net_util.h | 0 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 core/federated/networks/CMakeLists.txt rename core/federated/{ => networks}/net_util.c (100%) rename include/core/federated/{ => networks}/net_common.h (100%) rename include/core/federated/{ => networks}/net_util.h (100%) diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index c43dd70f3..666f062b0 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -68,7 +68,7 @@ add_executable( ${CoreLib}/platform/lf_unix_clock_support.c ${CoreLib}/utils/util.c ${CoreLib}/tag.c - ${CoreLib}/federated/net_util.c + ${CoreLib}/federated/networks/net_util.c ${CoreLib}/utils/pqueue.c message_record/message_record.c ) diff --git a/core/federated/networks/CMakeLists.txt b/core/federated/networks/CMakeLists.txt new file mode 100644 index 000000000..0e2bfe4d4 --- /dev/null +++ b/core/federated/networks/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 networks/) +target_sources(core PRIVATE ${LF_NETWORK_FILES}) diff --git a/core/federated/net_util.c b/core/federated/networks/net_util.c similarity index 100% rename from core/federated/net_util.c rename to core/federated/networks/net_util.c diff --git a/include/core/federated/net_common.h b/include/core/federated/networks/net_common.h similarity index 100% rename from include/core/federated/net_common.h rename to include/core/federated/networks/net_common.h diff --git a/include/core/federated/net_util.h b/include/core/federated/networks/net_util.h similarity index 100% rename from include/core/federated/net_util.h rename to include/core/federated/networks/net_util.h From 8b60b2399e9d5e6b0c6c672a3d34f19c57225608 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:16:08 -0700 Subject: [PATCH 02/25] Change cmakes --- CMakeLists.txt | 1 + core/CMakeLists.txt | 1 + core/federated/RTI/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c675a3f53..c36a5b86c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,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/networks) 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 index a9026392c..0804bdbf8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -46,6 +46,7 @@ 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/networks) 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/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 666f062b0..466e194b5 100644 --- 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/networks) include_directories(${IncludeDir}/modal_models) include_directories(${IncludeDir}/platform) include_directories(${IncludeDir}/utils) From e19d12acf4144e6886a1967d7628b049ffb6e91e Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:39:22 -0700 Subject: [PATCH 03/25] Fix head --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 1f7391f92..633fedf7e 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -master +e9249a300ddfeb98d129589912dbb2a9e6d27164 From 4dad39665a0fc5be355218f8c1e4db0b7996b6ca Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 12:32:19 -0700 Subject: [PATCH 04/25] Fix net_util.h pointing path --- include/core/federated/networks/net_util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/federated/networks/net_util.h b/include/core/federated/networks/net_util.h index cc621115d..5c6bcb966 100644 --- a/include/core/federated/networks/net_util.h +++ b/include/core/federated/networks/net_util.h @@ -48,8 +48,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../platform.h" -#include "../tag.h" +#include "../../platform.h" +#include "../../tag.h" #define HOST_LITTLE_ENDIAN 1 #define HOST_BIG_ENDIAN 2 From aaddd50e4fca2f39ad74d6dfb5ba641e1e132786 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 13:49:33 -0700 Subject: [PATCH 05/25] Fix networks to network --- CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- core/federated/RTI/CMakeLists.txt | 4 ++-- core/federated/{networks => network}/CMakeLists.txt | 2 +- core/federated/{networks => network}/net_util.c | 0 include/core/federated/{networks => network}/net_common.h | 0 include/core/federated/{networks => network}/net_util.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename core/federated/{networks => network}/CMakeLists.txt (71%) rename core/federated/{networks => network}/net_util.c (100%) rename include/core/federated/{networks => network}/net_common.h (100%) rename include/core/federated/{networks => network}/net_util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c36a5b86c..695950ec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,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/networks) +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 index 0804bdbf8..0a6d1060c 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -46,7 +46,7 @@ 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/networks) +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/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 466e194b5..24ed4998f 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -52,7 +52,7 @@ endif() set(IncludeDir ../../../include/core) include_directories(${IncludeDir}) include_directories(${IncludeDir}/federated) -include_directories(${IncludeDir}/federated/networks) +include_directories(${IncludeDir}/federated/network) include_directories(${IncludeDir}/modal_models) include_directories(${IncludeDir}/platform) include_directories(${IncludeDir}/utils) @@ -69,7 +69,7 @@ add_executable( ${CoreLib}/platform/lf_unix_clock_support.c ${CoreLib}/utils/util.c ${CoreLib}/tag.c - ${CoreLib}/federated/networks/net_util.c + ${CoreLib}/federated/network/net_util.c ${CoreLib}/utils/pqueue.c message_record/message_record.c ) diff --git a/core/federated/networks/CMakeLists.txt b/core/federated/network/CMakeLists.txt similarity index 71% rename from core/federated/networks/CMakeLists.txt rename to core/federated/network/CMakeLists.txt index 0e2bfe4d4..cbf58d1e9 100644 --- a/core/federated/networks/CMakeLists.txt +++ b/core/federated/network/CMakeLists.txt @@ -1,5 +1,5 @@ set(LF_NETWORK_FILES net_util.c) list(APPEND INFO_SOURCES ${LF_NETWORK_FILES}) -list(TRANSFORM LF_NETWORK_FILES PREPEND networks/) +list(TRANSFORM LF_NETWORK_FILES PREPEND network/) target_sources(core PRIVATE ${LF_NETWORK_FILES}) diff --git a/core/federated/networks/net_util.c b/core/federated/network/net_util.c similarity index 100% rename from core/federated/networks/net_util.c rename to core/federated/network/net_util.c diff --git a/include/core/federated/networks/net_common.h b/include/core/federated/network/net_common.h similarity index 100% rename from include/core/federated/networks/net_common.h rename to include/core/federated/network/net_common.h diff --git a/include/core/federated/networks/net_util.h b/include/core/federated/network/net_util.h similarity index 100% rename from include/core/federated/networks/net_util.h rename to include/core/federated/network/net_util.h From 01e4b7559f1ec8522ffb652e33f0284e96b87cc9 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:18:06 -0700 Subject: [PATCH 06/25] Fix CMake --- core/federated/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/federated/CMakeLists.txt b/core/federated/CMakeLists.txt index d5af17c2b..c0e32abde 100644 --- 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/) From 7af1b7583fa656eb92c475a6de37b8aab8db3108 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:19:40 -0700 Subject: [PATCH 07/25] Update reactor-c --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 633fedf7e..8bc40f57b 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -e9249a300ddfeb98d129589912dbb2a9e6d27164 +7a24b9baf36f30ccdce31bfb731bf7d602cb41b1 From 2a1b745a85c44efb0fd5a1d27ad21a35a9fe848b Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:31:35 -0700 Subject: [PATCH 08/25] Add core/CMakeLists.txt to include the network/CMakeLists.txt --- core/CMakeLists.txt | 2 ++ core/federated/network/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0a6d1060c..af79f7b60 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(core ${GENERAL_SOURCES}) # Add sources for either threaded or unthreaded runtime if (DEFINED FEDERATED) include(federated/CMakeLists.txt) + include(federated/network/CMakeLists.txt) endif() # Add sources for either threaded or unthreaded runtime @@ -39,6 +40,7 @@ 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}) diff --git a/core/federated/network/CMakeLists.txt b/core/federated/network/CMakeLists.txt index cbf58d1e9..82795b7bb 100644 --- a/core/federated/network/CMakeLists.txt +++ b/core/federated/network/CMakeLists.txt @@ -1,5 +1,5 @@ set(LF_NETWORK_FILES net_util.c) list(APPEND INFO_SOURCES ${LF_NETWORK_FILES}) -list(TRANSFORM LF_NETWORK_FILES PREPEND network/) +list(TRANSFORM LF_NETWORK_FILES PREPEND federated/network/) target_sources(core PRIVATE ${LF_NETWORK_FILES}) From 9b2225c6d6e1606f4c1002295e700fb724257bff Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:32:17 -0700 Subject: [PATCH 09/25] Fix ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 8bc40f57b..adb9ac2dd 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -7a24b9baf36f30ccdce31bfb731bf7d602cb41b1 +35231ece18b0322d0e5c9b582f7c80fef1d4f5a2 From 0538726ac6092bb4d4c1c5cafd6ea98a3c418c03 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 16:05:48 -0700 Subject: [PATCH 10/25] Update ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index adb9ac2dd..59825e701 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -35231ece18b0322d0e5c9b582f7c80fef1d4f5a2 +0276aa6c9527fd08b93b849237a5cb65b2f76625 From a53ad1e9f194d2092248ede864a701563b07318a Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Mon, 30 Oct 2023 08:44:30 -0700 Subject: [PATCH 11/25] Fix lingua-franca-ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 59825e701..b31da30ef 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -0276aa6c9527fd08b93b849237a5cb65b2f76625 +81819f2df9addee1ca86d33bd699826eff4c0ed9 From 4805fc920b063dd3c15d058457843b5167d02f65 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:06:56 -0700 Subject: [PATCH 12/25] Change file structure --- core/federated/RTI/CMakeLists.txt | 2 +- core/federated/networks/CMakeLists.txt | 5 +++++ core/federated/{ => networks}/net_util.c | 0 include/core/federated/{ => networks}/net_common.h | 0 include/core/federated/{ => networks}/net_util.h | 0 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 core/federated/networks/CMakeLists.txt rename core/federated/{ => networks}/net_util.c (100%) rename include/core/federated/{ => networks}/net_common.h (100%) rename include/core/federated/{ => networks}/net_util.h (100%) diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index c43dd70f3..666f062b0 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -68,7 +68,7 @@ add_executable( ${CoreLib}/platform/lf_unix_clock_support.c ${CoreLib}/utils/util.c ${CoreLib}/tag.c - ${CoreLib}/federated/net_util.c + ${CoreLib}/federated/networks/net_util.c ${CoreLib}/utils/pqueue.c message_record/message_record.c ) diff --git a/core/federated/networks/CMakeLists.txt b/core/federated/networks/CMakeLists.txt new file mode 100644 index 000000000..0e2bfe4d4 --- /dev/null +++ b/core/federated/networks/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 networks/) +target_sources(core PRIVATE ${LF_NETWORK_FILES}) diff --git a/core/federated/net_util.c b/core/federated/networks/net_util.c similarity index 100% rename from core/federated/net_util.c rename to core/federated/networks/net_util.c diff --git a/include/core/federated/net_common.h b/include/core/federated/networks/net_common.h similarity index 100% rename from include/core/federated/net_common.h rename to include/core/federated/networks/net_common.h diff --git a/include/core/federated/net_util.h b/include/core/federated/networks/net_util.h similarity index 100% rename from include/core/federated/net_util.h rename to include/core/federated/networks/net_util.h From a06fafbdfe2a0ea80bcc05dec643fa0c42e4b295 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:16:08 -0700 Subject: [PATCH 13/25] Change cmakes --- CMakeLists.txt | 1 + core/CMakeLists.txt | 1 + core/federated/RTI/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c675a3f53..c36a5b86c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,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/networks) 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 index a9026392c..0804bdbf8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -46,6 +46,7 @@ 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/networks) 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/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 666f062b0..466e194b5 100644 --- 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/networks) include_directories(${IncludeDir}/modal_models) include_directories(${IncludeDir}/platform) include_directories(${IncludeDir}/utils) From 49e4bddf3822a5dd7f384d4c1e70dfbe72d60a36 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 20 Oct 2023 18:39:22 -0700 Subject: [PATCH 14/25] Fix head --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 1f7391f92..633fedf7e 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -master +e9249a300ddfeb98d129589912dbb2a9e6d27164 From 57efaed119b81a70ca5a2acb0ca3f3aad362a981 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 12:32:19 -0700 Subject: [PATCH 15/25] Fix net_util.h pointing path --- include/core/federated/networks/net_util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/federated/networks/net_util.h b/include/core/federated/networks/net_util.h index cc621115d..5c6bcb966 100644 --- a/include/core/federated/networks/net_util.h +++ b/include/core/federated/networks/net_util.h @@ -48,8 +48,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../platform.h" -#include "../tag.h" +#include "../../platform.h" +#include "../../tag.h" #define HOST_LITTLE_ENDIAN 1 #define HOST_BIG_ENDIAN 2 From 78e92576095c4560396329264d593ca0f995e5fc Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 13:49:33 -0700 Subject: [PATCH 16/25] Fix networks to network --- CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- core/federated/RTI/CMakeLists.txt | 4 ++-- core/federated/{networks => network}/CMakeLists.txt | 2 +- core/federated/{networks => network}/net_util.c | 0 include/core/federated/{networks => network}/net_common.h | 0 include/core/federated/{networks => network}/net_util.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename core/federated/{networks => network}/CMakeLists.txt (71%) rename core/federated/{networks => network}/net_util.c (100%) rename include/core/federated/{networks => network}/net_common.h (100%) rename include/core/federated/{networks => network}/net_util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c36a5b86c..695950ec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,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/networks) +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 index 0804bdbf8..0a6d1060c 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -46,7 +46,7 @@ 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/networks) +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/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 466e194b5..24ed4998f 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -52,7 +52,7 @@ endif() set(IncludeDir ../../../include/core) include_directories(${IncludeDir}) include_directories(${IncludeDir}/federated) -include_directories(${IncludeDir}/federated/networks) +include_directories(${IncludeDir}/federated/network) include_directories(${IncludeDir}/modal_models) include_directories(${IncludeDir}/platform) include_directories(${IncludeDir}/utils) @@ -69,7 +69,7 @@ add_executable( ${CoreLib}/platform/lf_unix_clock_support.c ${CoreLib}/utils/util.c ${CoreLib}/tag.c - ${CoreLib}/federated/networks/net_util.c + ${CoreLib}/federated/network/net_util.c ${CoreLib}/utils/pqueue.c message_record/message_record.c ) diff --git a/core/federated/networks/CMakeLists.txt b/core/federated/network/CMakeLists.txt similarity index 71% rename from core/federated/networks/CMakeLists.txt rename to core/federated/network/CMakeLists.txt index 0e2bfe4d4..cbf58d1e9 100644 --- a/core/federated/networks/CMakeLists.txt +++ b/core/federated/network/CMakeLists.txt @@ -1,5 +1,5 @@ set(LF_NETWORK_FILES net_util.c) list(APPEND INFO_SOURCES ${LF_NETWORK_FILES}) -list(TRANSFORM LF_NETWORK_FILES PREPEND networks/) +list(TRANSFORM LF_NETWORK_FILES PREPEND network/) target_sources(core PRIVATE ${LF_NETWORK_FILES}) diff --git a/core/federated/networks/net_util.c b/core/federated/network/net_util.c similarity index 100% rename from core/federated/networks/net_util.c rename to core/federated/network/net_util.c diff --git a/include/core/federated/networks/net_common.h b/include/core/federated/network/net_common.h similarity index 100% rename from include/core/federated/networks/net_common.h rename to include/core/federated/network/net_common.h diff --git a/include/core/federated/networks/net_util.h b/include/core/federated/network/net_util.h similarity index 100% rename from include/core/federated/networks/net_util.h rename to include/core/federated/network/net_util.h From def23281cd6daa31a773e1221d673f4d1c643a8b Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:18:06 -0700 Subject: [PATCH 17/25] Fix CMake --- core/federated/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/federated/CMakeLists.txt b/core/federated/CMakeLists.txt index d5af17c2b..c0e32abde 100644 --- 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/) From d987d0c44c96ab272a5d7737adf5cdaae0f3997b Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:19:40 -0700 Subject: [PATCH 18/25] Update reactor-c --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 633fedf7e..8bc40f57b 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -e9249a300ddfeb98d129589912dbb2a9e6d27164 +7a24b9baf36f30ccdce31bfb731bf7d602cb41b1 From ad92df5fd61adaa42d3d5479f347390cbd7c754d Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:31:35 -0700 Subject: [PATCH 19/25] Add core/CMakeLists.txt to include the network/CMakeLists.txt --- core/CMakeLists.txt | 2 ++ core/federated/network/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0a6d1060c..af79f7b60 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(core ${GENERAL_SOURCES}) # Add sources for either threaded or unthreaded runtime if (DEFINED FEDERATED) include(federated/CMakeLists.txt) + include(federated/network/CMakeLists.txt) endif() # Add sources for either threaded or unthreaded runtime @@ -39,6 +40,7 @@ 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}) diff --git a/core/federated/network/CMakeLists.txt b/core/federated/network/CMakeLists.txt index cbf58d1e9..82795b7bb 100644 --- a/core/federated/network/CMakeLists.txt +++ b/core/federated/network/CMakeLists.txt @@ -1,5 +1,5 @@ set(LF_NETWORK_FILES net_util.c) list(APPEND INFO_SOURCES ${LF_NETWORK_FILES}) -list(TRANSFORM LF_NETWORK_FILES PREPEND network/) +list(TRANSFORM LF_NETWORK_FILES PREPEND federated/network/) target_sources(core PRIVATE ${LF_NETWORK_FILES}) From 4a7a112511436539883002f0b789fc2b2c117613 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 14:32:17 -0700 Subject: [PATCH 20/25] Fix ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 8bc40f57b..adb9ac2dd 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -7a24b9baf36f30ccdce31bfb731bf7d602cb41b1 +35231ece18b0322d0e5c9b582f7c80fef1d4f5a2 From 1befad0370159b2cac09ce6fe4b8ee281c142435 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 25 Oct 2023 16:05:48 -0700 Subject: [PATCH 21/25] Update ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index adb9ac2dd..59825e701 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -35231ece18b0322d0e5c9b582f7c80fef1d4f5a2 +0276aa6c9527fd08b93b849237a5cb65b2f76625 From f42708b71ec69006cb4fcb9e998fe5ae40d14b46 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Mon, 30 Oct 2023 08:44:30 -0700 Subject: [PATCH 22/25] Fix lingua-franca-ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 59825e701..b31da30ef 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -0276aa6c9527fd08b93b849237a5cb65b2f76625 +81819f2df9addee1ca86d33bd699826eff4c0ed9 From 7fe502ac412a13fcd8f418f9cb85cbbb33e7bbd6 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Mon, 13 Nov 2023 09:29:34 -0700 Subject: [PATCH 23/25] Update lingua-franca-ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index b31da30ef..0cf11b8bf 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -81819f2df9addee1ca86d33bd699826eff4c0ed9 +b5e73d091cd9275fc5bbdc42c936d67a934512ec From ec4223a486012d2e95ba77b6102a532b4601a620 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Wed, 22 Nov 2023 09:10:22 -0700 Subject: [PATCH 24/25] Update lingua-franca-ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 1f7391f92..c81de7a34 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -master +47b87a49ceece1f0065a9dbf9b8a06c9fcdfe01d From 8f4e526611db54623d942ed1847632ccf465cf5d Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Fri, 1 Dec 2023 16:01:46 -0800 Subject: [PATCH 25/25] Update lingua-franca-ref.txt --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index c81de7a34..258a8ab0b 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -47b87a49ceece1f0065a9dbf9b8a06c9fcdfe01d +network-structure