Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make new directory under federated named network #292

Merged
merged 32 commits into from
Dec 2, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
437de9e
Change file structure
Jakio815 Oct 21, 2023
8b60b23
Change cmakes
Jakio815 Oct 21, 2023
e19d12a
Fix head
Jakio815 Oct 21, 2023
4dad396
Fix net_util.h pointing path
Jakio815 Oct 25, 2023
aaddd50
Fix networks to network
Jakio815 Oct 25, 2023
01e4b75
Fix CMake
Jakio815 Oct 25, 2023
7af1b75
Update reactor-c
Jakio815 Oct 25, 2023
2a1b745
Add core/CMakeLists.txt to include the network/CMakeLists.txt
Jakio815 Oct 25, 2023
9b2225c
Fix ref.txt
Jakio815 Oct 25, 2023
eed0374
Merge branch 'main' into network-structure
Jakio815 Oct 25, 2023
0538726
Update ref.txt
Jakio815 Oct 25, 2023
a93d033
Merge branch 'main' into network-structure
Jakio815 Oct 30, 2023
a53ad1e
Fix lingua-franca-ref.txt
Jakio815 Oct 30, 2023
4805fc9
Change file structure
Jakio815 Oct 21, 2023
a06fafb
Change cmakes
Jakio815 Oct 21, 2023
49e4bdd
Fix head
Jakio815 Oct 21, 2023
57efaed
Fix net_util.h pointing path
Jakio815 Oct 25, 2023
78e9257
Fix networks to network
Jakio815 Oct 25, 2023
def2328
Fix CMake
Jakio815 Oct 25, 2023
d987d0c
Update reactor-c
Jakio815 Oct 25, 2023
ad92df5
Add core/CMakeLists.txt to include the network/CMakeLists.txt
Jakio815 Oct 25, 2023
4a7a112
Fix ref.txt
Jakio815 Oct 25, 2023
1befad0
Update ref.txt
Jakio815 Oct 25, 2023
f42708b
Fix lingua-franca-ref.txt
Jakio815 Oct 30, 2023
b5d7cd3
Merge branch 'main' into network-structure
Jakio815 Nov 6, 2023
d344aee
Merge branch 'network-structure' of github.com:lf-lang/reactor-c into…
Jakio815 Nov 13, 2023
7fe502a
Update lingua-franca-ref.txt
Jakio815 Nov 13, 2023
89aa9b8
Merge branch 'main' of github.com:lf-lang/reactor-c into network-stru…
Jakio815 Nov 22, 2023
ec4223a
Update lingua-franca-ref.txt
Jakio815 Nov 22, 2023
efebdc8
Merge branch 'main' of github.com:lf-lang/reactor-c into network-stru…
Jakio815 Dec 1, 2023
8f4e526
Update lingua-franca-ref.txt
lhstrh Dec 2, 2023
812e403
Merge branch 'main' into network-structure
Jakio815 Dec 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion core/federated/RTI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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/networks/net_util.c
${CoreLib}/utils/pqueue.c
message_record/message_record.c
)
Expand Down
5 changes: 5 additions & 0 deletions core/federated/networks/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set(LF_NETWORK_FILES net_util.c)
Jakio815 marked this conversation as resolved.
Show resolved Hide resolved
list(APPEND INFO_SOURCES ${LF_NETWORK_FILES})

list(TRANSFORM LF_NETWORK_FILES PREPEND networks/)
target_sources(core PRIVATE ${LF_NETWORK_FILES})
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lingua-franca-ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master
e9249a300ddfeb98d129589912dbb2a9e6d27164
Loading