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.

Sign up for GitHub

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

removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS made IOX_MAX_NUMBER_OF_N… #2090

Merged
merged 5 commits into from
Nov 21, 2023
Merged

removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS made IOX_MAX_NUMBER_OF_N… #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a550c12
iox-#2083 Removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS made IOX_MAX_N…
niclar Nov 13, 2023
7d7eaac
iox-#2083 Added changelog
niclar Nov 15, 2023
294a88b
iox-#2083 made BUILD.bazel lexicographically sorted again
niclar Nov 15, 2023
252f7f0
iox-#2083 changed tab to spaces in the bazel script and fixed the rel…
niclar Nov 21, 2023
b40502d
Merge branch 'master' into bugfix/iox-#2083-configurable-max-notifiers
elBoberido Nov 21, 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 doc/website/release-notes/iceoryx-unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions iceoryx_posh/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
12 changes: 4 additions & 8 deletions iceoryx_posh/cmake/IceoryxPoshDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")

2 changes: 1 addition & 1 deletion iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@);
Expand Down