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

iox-#2394 Make max number of Client and Server configurable #2395

Merged
merged 3 commits into from
Dec 16, 2024
Merged

iox-#2394 Make max number of Client and Server configurable #2395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c09be4
iox-#2394 Make max number of Client and Server configurable
elBoberido Dec 16, 2024
e6295ee
iox-#2394 Fix discovery tests
elBoberido Dec 16, 2024
0dcaa10
iox-#2394 Fix bazel
elBoberido Dec 16, 2024
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 @@ -147,6 +147,7 @@
- Add //:iceoryx Bazel alias [#2368](https://github.com/eclipse-iceoryx/iceoryx/issues/2368)
- Depend on @ncurses when building with Bazel [#2372](https://github.com/eclipse-iceoryx/iceoryx/issues/2372)
- Fix windows performance issue [#2377](https://github.com/eclipse-iceoryx/iceoryx/issues/2377)
- Max Client and Server cannot be configured independently of Max Publisher and Subscriber [#2394](https://github.com/eclipse-iceoryx/iceoryx/issues/2394)

**Refactoring:**

Expand Down
2 changes: 2 additions & 0 deletions iceoryx_examples/small_memory/options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ set(IOX_MAX_NUMBER_OF_CONDITION_VARIABLES 8 CACHE STRING "")
set(IOX_MAX_NODE_NAME_LENGTH 30 CACHE STRING "")
set(IOX_MAX_ID_STRING_LENGTH 30 CACHE STRING "")
set(IOX_MAX_RUNTIME_NAME_LENGTH 30 CACHE STRING "")
set(IOX_MAX_CLIENTS 4 CACHE STRING "")
set(IOX_MAX_SERVERS 2 CACHE STRING "")
set(IOX_MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY 2 CACHE STRING "")
set(IOX_MAX_RESPONSE_QUEUE_CAPACITY 2 CACHE STRING "")
set(IOX_MAX_REQUEST_QUEUE_CAPACITY 2 CACHE STRING "")
Expand Down
8 changes: 8 additions & 0 deletions iceoryx_posh/cmake/IceoryxPoshDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ configure_option(
NAME IOX_MAX_RUNTIME_NAME_LENGTH
DEFAULT_VALUE ${IOX_MAX_RUNTIME_NAME_LENGTH_DEFAULT}
)
configure_option(
NAME IOX_MAX_SERVERS
DEFAULT_VALUE 128
)
configure_option(
NAME IOX_MAX_CLIENTS
DEFAULT_VALUE 512
)
configure_option(
NAME IOX_MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY
DEFAULT_VALUE 16
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -73,6 +73,8 @@ constexpr uint32_t IOX_MAX_NUMBER_OF_CONDITION_VARIABLES =
constexpr uint32_t IOX_MAX_NODE_NAME_LENGTH = static_cast<uint32_t>(@IOX_MAX_NODE_NAME_LENGTH@);
constexpr uint32_t IOX_MAX_ID_STRING_LENGTH = static_cast<uint32_t>(@IOX_MAX_ID_STRING_LENGTH@);
constexpr uint32_t IOX_MAX_RUNTIME_NAME_LENGTH = static_cast<uint32_t>(@IOX_MAX_RUNTIME_NAME_LENGTH@);
constexpr uint32_t IOX_MAX_CLIENTS = static_cast<uint32_t>(@IOX_MAX_CLIENTS@);
constexpr uint32_t IOX_MAX_SERVERS = static_cast<uint32_t>(@IOX_MAX_SERVERS@);
constexpr uint32_t IOX_MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY =
static_cast<uint32_t>(@IOX_MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY@);
constexpr uint32_t IOX_MAX_RESPONSE_QUEUE_CAPACITY = static_cast<uint32_t>(@IOX_MAX_RESPONSE_QUEUE_CAPACITY@);
Expand Down
4 changes: 2 additions & 2 deletions iceoryx_posh/include/iceoryx_posh/iceoryx_posh_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ constexpr uint32_t MAX_INTERFACE_CAPRO_FIFO_SIZE = MAX_PUBLISHERS;
constexpr uint32_t MAX_CHANNEL_NUMBER = MAX_PUBLISHERS + MAX_SUBSCRIBERS;
constexpr uint32_t MAX_GATEWAY_SERVICES = 2 * MAX_CHANNEL_NUMBER;
// Client
constexpr uint32_t MAX_CLIENTS = build::IOX_MAX_SUBSCRIBERS;
constexpr uint32_t MAX_CLIENTS = build::IOX_MAX_CLIENTS;
constexpr uint32_t MAX_REQUESTS_ALLOCATED_SIMULTANEOUSLY = 4U;
constexpr uint32_t MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY = build::IOX_MAX_RESPONSES_PROCESSED_SIMULTANEOUSLY;
constexpr uint32_t MAX_RESPONSE_QUEUE_CAPACITY = build::IOX_MAX_RESPONSE_QUEUE_CAPACITY;
// Server
constexpr uint32_t MAX_SERVERS = build::IOX_MAX_PUBLISHERS;
constexpr uint32_t MAX_SERVERS = build::IOX_MAX_SERVERS;
constexpr uint32_t MAX_CLIENTS_PER_SERVER = build::IOX_MAX_CLIENTS_PER_SERVER;
constexpr uint32_t MAX_REQUESTS_PROCESSED_SIMULTANEOUSLY = build::IOX_MAX_REQUESTS_PROCESSED_SIMULTANEOUSLY;
constexpr uint32_t MAX_RESPONSES_ALLOCATED_SIMULTANEOUSLY = MAX_REQUESTS_PROCESSED_SIMULTANEOUSLY;
Expand Down
Loading