From 461b96d36197f0d6dc9f121aff24b352b2bfced6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niclas=20Lars=C3=A9n?= Date: Mon, 13 Nov 2023 09:57:46 +0100 Subject: [PATCH] removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS made IOX_MAX_NUMBER_OF_NOTIFIERS configurable again --- iceoryx_posh/BUILD.bazel | 4 ++-- iceoryx_posh/cmake/IceoryxPoshDeployment.cmake | 12 ++++-------- iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/iceoryx_posh/BUILD.bazel b/iceoryx_posh/BUILD.bazel index 77f9f634f63..a900e95af0e 100644 --- a/iceoryx_posh/BUILD.bazel +++ b/iceoryx_posh/BUILD.bazel @@ -29,7 +29,7 @@ configure_file( # FIXME: for values see "iceoryx_posh/cmake/IceoryxPoshDeployment.cmake" ... for now some nice defaults "@platforms//os:macos": { "IOX_COMMUNICATION_POLICY": "ManyToManyPolicy", - "IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS": "256", + "IOX_MAX_NUMBER_OF_NOTIFIERS": "256", "IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY": "8", "IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY": "256", "IOX_MAX_CLIENTS_PER_SERVER": "256", @@ -53,7 +53,7 @@ configure_file( }, "//conditions:default": { "IOX_COMMUNICATION_POLICY": "ManyToManyPolicy", - "IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS": "256", + "IOX_MAX_NUMBER_OF_NOTIFIERS": "256", "IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY": "8", "IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY": "256", "IOX_MAX_CLIENTS_PER_SERVER": "256", diff --git a/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake b/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake index 5d6c5b430cc..79dafa16dd4 100644 --- a/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake +++ b/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake @@ -127,14 +127,10 @@ configure_option( NAME IOX_MAX_CLIENTS_PER_SERVER DEFAULT_VALUE 256 ) - -# note: don't change IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS value because it could break the C-Binding -#configure_option( -# NAME IOX_MAX_NUMBER_OF_NOTIFIERS -# DEFAULT_VALUE 256 -#) -set(IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS 256) - +configure_option( + NAME IOX_MAX_NUMBER_OF_NOTIFIERS + DEFAULT_VALUE 256 +) message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_posh configuration: >>>>>>>>>>>>>>") diff --git a/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in b/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in index 9d82a0a3d4e..f3a5223e556 100644 --- a/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in +++ b/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in @@ -46,7 +46,7 @@ constexpr uint32_t IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY = constexpr uint64_t IOX_MAX_PUBLISHER_HISTORY = static_cast(@IOX_MAX_PUBLISHER_HISTORY@); constexpr uint32_t IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY = static_cast(@IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY@); - constexpr uint32_t IOX_MAX_NUMBER_OF_NOTIFIERS = static_cast(@IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS@); + constexpr uint32_t IOX_MAX_NUMBER_OF_NOTIFIERS = static_cast(@IOX_MAX_NUMBER_OF_NOTIFIERS@); constexpr uint32_t IOX_MAX_PROCESS_NUMBER = static_cast(@IOX_MAX_PROCESS_NUMBER@); constexpr uint32_t IOX_MAX_NODE_NUMBER = static_cast(@IOX_MAX_NODE_NUMBER@); constexpr uint32_t IOX_MAX_NODE_PER_PROCESS = static_cast(@IOX_MAX_NODE_PER_PROCESS@);