Merge pull request #2090 from niclar/bugfix/iox-#2083-configurable-ma…

…x-notifiers removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS made IOX_MAX_NUMBER_OF_N…
eclipse-iceoryx · Nov 21, 2023 · b184113 · b184113
2 parents 1ac5726 + b40502d
commit b184113
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -179,6 +179,7 @@
 - Improve process is alive detection [#1361](https://github.com/eclipse-iceoryx/iceoryx/issues/1361)
     - only partially
     - IPC call is replaced with heartbeat via shared memory
+- Removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS and made IOX_MAX_NUMBER_OF_NOTIFIERS configurable again [#2083](https://github.com/eclipse-iceoryx/iceoryx/issues/2083)
 - Setting IOX_NO_DISCARD in QNX [#638](https://github.com/eclipse-iceoryx/iceoryx/issues/638)
 - Replace `iox::byte_t` with std::byte [#1900](https://github.com/eclipse-iceoryx/iceoryx/issues/1900)
 

diff --git a/iceoryx_posh/BUILD.bazel b/iceoryx_posh/BUILD.bazel
@@ -29,7 +29,6 @@ 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_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY": "8",
             "IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY": "256",
             "IOX_MAX_CLIENTS_PER_SERVER": "256",
@@ -40,6 +39,7 @@ configure_file(
             "IOX_MAX_NODE_PER_PROCESS": "50",
             "IOX_MAX_NUMBER_OF_CONDITION_VARIABLES": "1024",
             "IOX_MAX_NUMBER_OF_MEMPOOLS": "32",
+            "IOX_MAX_NUMBER_OF_NOTIFIERS": "256",
             "IOX_MAX_PROCESS_NUMBER": "300",
             "IOX_MAX_PUBLISHERS": "512",
             "IOX_MAX_PUBLISHER_HISTORY": "16",
@@ -53,7 +53,6 @@ configure_file(
         },
         "//conditions:default": {
             "IOX_COMMUNICATION_POLICY": "ManyToManyPolicy",
-            "IOX_INTERNAL_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",
@@ -64,6 +63,7 @@ configure_file(
             "IOX_MAX_NODE_PER_PROCESS": "50",
             "IOX_MAX_NUMBER_OF_CONDITION_VARIABLES": "1024",
             "IOX_MAX_NUMBER_OF_MEMPOOLS": "32",
+            "IOX_MAX_NUMBER_OF_NOTIFIERS": "256",
             "IOX_MAX_PROCESS_NUMBER": "300",
             "IOX_MAX_PUBLISHERS": "512",
             "IOX_MAX_PUBLISHER_HISTORY": "16",

diff --git 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
@@ -46,7 +46,7 @@ constexpr uint32_t IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY =
 constexpr uint64_t IOX_MAX_PUBLISHER_HISTORY = static_cast<uint32_t>(@IOX_MAX_PUBLISHER_HISTORY@);
 constexpr uint32_t IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY =
     static_cast<uint32_t>(@IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY@);
- constexpr uint32_t IOX_MAX_NUMBER_OF_NOTIFIERS = static_cast<uint32_t>(@IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS@);
+ constexpr uint32_t IOX_MAX_NUMBER_OF_NOTIFIERS = static_cast<uint32_t>(@IOX_MAX_NUMBER_OF_NOTIFIERS@);
  constexpr uint32_t IOX_MAX_PROCESS_NUMBER = static_cast<uint32_t>(@IOX_MAX_PROCESS_NUMBER@);
  constexpr uint32_t IOX_MAX_NODE_NUMBER = static_cast<uint32_t>(@IOX_MAX_NODE_NUMBER@);
  constexpr uint32_t IOX_MAX_NODE_PER_PROCESS = static_cast<uint32_t>(@IOX_MAX_NODE_PER_PROCESS@);