Remove the config.h.in and do things through compile defs (#103)

* Remove the config.h.in and do things through compile defs * Improve CMake a little * Rename NETWORK_POSIX_TCP -> NETWORK_CHANNEL_TCP_POSIX
lf-lang · Oct 26, 2024 · 82e72f6 · 82e72f6
1 parent dedbf16
commit 82e72f6
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,5 @@
 cmake-build-debug
 cmake-build-release
 .idea
-include/reactor-uc/config.h
 !lfc/bin
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,9 +8,9 @@ set(BUILD_UNIT_TESTS OFF CACHE BOOL "Build unit tests")
 set(TEST_COVERAGE OFF CACHE BOOL "Compute test coverage")
 set(ASAN OFF CACHE BOOL "Compile with AddressSanitizer")
 set(PLATFORM "POSIX" CACHE STRING "Platform to target")
-set(EVENT_QUEUE_SIZE 10 CACHE STRING "Static size of the event queue")
-set(REACTION_QUEUE_SIZE 10 CACHE STRING "Static size of the reaction queue")
-set(NETWORK_POSIX_TCP OFF CACHE BOOL "Use POSIX TCP NetworkChannel")
+set(EVENT_QUEUE_SIZE 32 CACHE STRING "Static size of the event queue")
+set(REACTION_QUEUE_SIZE 32 CACHE STRING "Static size of the reaction queue")
+set(NETWORK_CHANNEL_TCP_POSIX OFF CACHE BOOL "Use POSIX TCP NetworkChannel")
 
 # Code coverage setup 
 if(TEST_COVERAGE)
@@ -30,7 +30,7 @@ endif()
 if(BUILD_TESTS)
   set(BUILD_LF_TESTS ON)
   set(BUILD_UNIT_TESTS ON)
-  set(NETWORK_POSIX_TCP ON) # TODO: This is currently needed because one of the tests uses this stack, we need a nicer way of selecting build options for tests and apps.
+  set(NETWORK_CHANNEL_TCP_POSIX ON) # TODO: This is currently needed because one of the tests uses this stack, we need a nicer way of selecting build options for tests and apps.
   set(CMAKE_BUILD_TYPE "Debug")
   find_program(CLANG_TIDY clang-tidy)
   if (CLANG_TIDY)
@@ -68,21 +68,21 @@ else ()
   message(FATAL_ERROR "No valid platform specified")
 endif ()
 
-add_compile_definitions("PLATFORM_${PLATFORM}")
-# TODO: Improve this here
-if(NETWORK_POSIX_TCP)
-  target_compile_definitions(reactor-uc PRIVATE NETWORK_POSIX_TCP)
+# Add compile definitions for platform and network channel specifics.
+target_compile_definitions(reactor-uc PRIVATE "PLATFORM_${PLATFORM}")
+
+# Add compile definitions for event and reaction queue sizes. Has to be PUBLIC because they are used in the header files.
+target_compile_definitions(reactor-uc PUBLIC EVENT_QUEUE_SIZE=${EVENT_QUEUE_SIZE})
+target_compile_definitions(reactor-uc PUBLIC REACTION_QUEUE_SIZE=${REACTION_QUEUE_SIZE})
+
+if(NETWORK_CHANNEL_TCP_POSIX)
+  target_compile_definitions(reactor-uc PRIVATE NETWORK_CHANNEL_TCP_POSIX)
 endif()
 
 target_compile_options(reactor-uc PRIVATE -Wall -Wextra -Werror)
 add_compile_options (-fdiagnostics-color=always)
 target_include_directories(reactor-uc PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/external)
 
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/reactor-uc/config.h.in 
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/reactor-uc/config.h
-)
-
 if(BUILD_UNIT_TESTS)
   set(UNITY_DIR ${CMAKE_CURRENT_LIST_DIR}/external/Unity)
   include(CTest)

diff --git a/examples/posix/federated/CMakeLists.txt b/examples/posix/federated/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0)
 project(reactor-uc-posix-hello)
 
 set(PLATFORM "POSIX" CACHE STRING "")
-set(NETWORK_POSIX_TCP ON CACHE STRING "")
+set(NETWORK_CHANNEL_TCP_POSIX ON CACHE STRING "")
 add_subdirectory(../../../ reactor-uc)
 
 add_executable(sender sender.c)

diff --git a/examples/riot/blinky/Makefile b/examples/riot/blinky/Makefile
@@ -13,6 +13,6 @@ DEVELHELP ?= 1
 QUIET ?= 1
 
 # Enable reactor-uc features
-CFLAGS += -DNETWORK_POSIX_TCP
+CFLAGS += -DNETWORK_CHANNEL_TCP_POSIX
 
 include $(CURDIR)/../../../make/riot/riot.mk
diff --git a/examples/riot/hello/Makefile b/examples/riot/hello/Makefile
@@ -13,6 +13,6 @@ DEVELHELP ?= 1
 QUIET ?= 1
 
 # Enable reactor-uc features
-# CFLAGS += -DNETWORK_POSIX_TCP
+# CFLAGS += -DNETWORK_CHANNEL_TCP_POSIX
 
 include $(CURDIR)/../../../make/riot/riot.mk
diff --git a/examples/zephyr/basic_federated/federated_receiver1/CMakeLists.txt b/examples/zephyr/basic_federated/federated_receiver1/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(reactor-uc-zephyr)
 
 # TODO: Improve the way of pickng which Network channels to add to the build.
-set(NETWORK_POSIX_TCP ON CACHE BOOL "blah")
+set(NETWORK_CHANNEL_TCP_POSIX ON CACHE BOOL "blah")
 set(PLATFORM "ZEPHYR" CACHE STRING "Platform to target")
 add_subdirectory(../../../../ reactor-uc)
 

diff --git a/examples/zephyr/basic_federated/federated_receiver2/CMakeLists.txt b/examples/zephyr/basic_federated/federated_receiver2/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(reactor-uc-zephyr)
 
 # TODO: Improve the way of pickng which Network channels to add to the build.
-set(NETWORK_POSIX_TCP ON CACHE BOOL "blah")
+set(NETWORK_CHANNEL_TCP_POSIX ON CACHE BOOL "blah")
 set(PLATFORM "ZEPHYR" CACHE STRING "Platform to target")
 add_subdirectory(../../../../ reactor-uc)
 

diff --git a/examples/zephyr/basic_federated/federated_sender/CMakeLists.txt b/examples/zephyr/basic_federated/federated_sender/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(reactor-uc-zephyr)
 
 # TODO: Improve the way of pickng which Network channels to add to the build.
-set(NETWORK_POSIX_TCP ON CACHE BOOL "blah")
+set(NETWORK_CHANNEL_TCP_POSIX ON CACHE BOOL "blah")
 set(PLATFORM "ZEPHYR" CACHE STRING "Platform to target")
 add_subdirectory(../../../../ reactor-uc)
 

diff --git a/include/reactor-uc/config.h.in b/include/reactor-uc/config.h.in
diff --git a/include/reactor-uc/queues.h b/include/reactor-uc/queues.h
@@ -1,7 +1,6 @@
 #ifndef REACTOR_UC_QUEUES_H
 #define REACTOR_UC_QUEUES_H
 
-#include "reactor-uc/config.h"
 #include "reactor-uc/error.h"
 #include "reactor-uc/event.h"
 #include "reactor-uc/reaction.h"

diff --git a/make/riot/external_modules/reactor-uc/Makefile.dep b/make/riot/external_modules/reactor-uc/Makefile.dep
@@ -3,8 +3,8 @@ USEMODULE += ztimer64_usec
 USEMODULE += nanopb
 USEMODULE += proto
 
-# If Feature NETWORK_POSIX_TCP is enabled
-ifeq ($(filter -DNETWORK_POSIX_TCP, $(CFLAGS)), -DNETWORK_POSIX_TCP)
+# If Feature NETWORK_CHANNEL_TCP_POSIX is enabled
+ifeq ($(filter -DNETWORK_CHANNEL_TCP_POSIX, $(CFLAGS)), -DNETWORK_CHANNEL_TCP_POSIX)
   # Enable networking
   USEMODULE += netdev_default
   USEMODULE += auto_init_gnrc_netif

diff --git a/src/network_channel.c b/src/network_channel.c
@@ -1,3 +1,23 @@
-#ifdef NETWORK_POSIX_TCP
+#if defined(PLATFORM_POSIX)
+#ifdef NETWORK_CHANNEL_TCP_POSIX
 #include "platform/posix/tcp_ip_channel.c"
-#endif
+#endif
+
+#elif defined(PLATFORM_ZEPHYR)
+#ifdef NETWORK_CHANNEL_TCP_POSIX
+#include "platform/posix/tcp_ip_channel.c"
+#endif
+
+#elif defined(PLATFORM_RIOT)
+#ifdef NETWORK_CHANNEL_TCP_POSIX
+#include "platform/posix/tcp_ip_channel.c"
+#endif
+
+#elif defined(PLATFORM_PICO)
+#ifdef NETWORK_CHANNEL_TCP_POSIX
+#error "NETWORK_POSIC_TCP not supported on PICO"
+#endif
+
+#else
+#error "Platform not supported"
+#endif