Skip to content

Commit 15915cb

Browse files
authored
Bump zenoh to 1.6.2 (#842)
1 parent a76d16f commit 15915cb

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ The following additional configuration options available as environment variable
263263
- `ZENOH_SHM_ALLOC_SIZE`: size (in bytes) of memory to allocate as shared memory arena. Must be a multiple of 4. The default value is 48 MiB.
264264
- `ZENOH_SHM_MESSAGE_SIZE_THRESHOLD`: threshold (in bytes) for ROS message wire size to be sent as SHM buffer. Must be a multiple of 4. The default value is 512. Note that depending on your hardware caracteristics (CPU, memory) it could be counter-productive for the latency of small messages to lower this threashold.
265265

266+
> [!IMPORTANT]
267+
> Make sure that the host's shared memory space (`/dev/shm` on Linux) is large enough for all the processes you run to allocate the `ZENOH_SHM_ALLOC_SIZE` amount of memory. As `rmw_zenoh` is pre-commiting the memory on startup, a process will fail if the shared memory is not available.
268+
> The default value of 48 MiB has been chosen to support out-of-the-box very large payloads such as a 4K video image (~24 MiB per image, 2 images in-flight). If you want to reduce the global amount of shared memory used by your ROS 2 system, you can tune the `ZENOH_SHM_ALLOC_SIZE` value according to each node requirements.
269+
266270
### Interoperability
267271
268272
- SHM-enabled nodes are fully interoperable with remote (non-localhost) nodes and localhost non-SHM-enabled nodes on transparent basis.

zenoh_cpp_vendor/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ find_package(ament_cmake_vendor_package REQUIRED)
1717
# latter is a list separater in cmake and hence the string will be split into two when expanded.
1818
set(ZENOHC_CARGO_FLAGS "--features=shared-memory zenoh/transport_serial")
1919

20-
# Set VCS_VERSION to 1.6.1 commits of zenoh/zenoh-c/zenoh-cpp to benefit from:
20+
# Set VCS_VERSION to 1.6.2 commits of zenoh/zenoh-c/zenoh-cpp to benefit from:
2121
# * Various performance improvements:
2222
# - https://github.com/eclipse-zenoh/zenoh/pull/2109
2323
# - https://github.com/eclipse-zenoh/zenoh/pull/2127
@@ -38,9 +38,13 @@ set(ZENOHC_CARGO_FLAGS "--features=shared-memory zenoh/transport_serial")
3838
# - https://github.com/eclipse-zenoh/zenoh/pull/2173
3939
# * Fix Access Control subject matching
4040
# - https://github.com/eclipse-zenoh/zenoh/pull/2141
41+
# * Fix 1.6.1 warnings: "Request to update QueryableInfo for inexistent face id"
42+
# - https://github.com/eclipse-zenoh/zenoh/pull/2205
43+
# * Precommit SHM pages, avoiding overcommit and possible crash if SHM exhausts
44+
# - https://github.com/eclipse-zenoh/zenoh/pull/2175
4145
ament_vendor(zenoh_c_vendor
4246
VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
43-
VCS_VERSION c12a77393fd8e1fc8b1e23a4aff8d8df9b4725f8
47+
VCS_VERSION f376456ccf75ed837a21a186bdf5191cba50eb3b
4448
CMAKE_ARGS
4549
"-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
4650
"-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE"
@@ -52,7 +56,7 @@ ament_export_dependencies(zenohc)
5256

5357
ament_vendor(zenoh_cpp_vendor
5458
VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp
55-
VCS_VERSION 65689877cb7dd877fca953eaf26366ebdbfe592b
59+
VCS_VERSION 0cd54f291039a65b96921a5951a66aeef088e67c
5660
CMAKE_ARGS
5761
-DZENOHCXX_ZENOHC=OFF
5862
)

0 commit comments

Comments
 (0)