Skip to content

Commit 0323702

Browse files
Bump zenoh-cpp to 2a127bb, zenoh-c to 3540a3c, and zenoh to f735bf5 (#503) (#511)
(cherry picked from commit 19b7f77) Co-authored-by: Luca Cominardi <[email protected]>
1 parent ed22f4f commit 0323702

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_ROUTER_CONFIG.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@
366366
// [
367367
// /// Each policy associates one or multiple rules to one or multiple subject combinations
368368
// {
369+
// /// Id is optional. If provided, it has to be unique within the policies list
370+
// "id": "policy1",
369371
// /// Rules and Subjects are identified with their unique IDs declared above
370372
// "rules": ["rule1"],
371373
// "subjects": ["subject1", "subject2"],

rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_SESSION_CONFIG.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374
// [
375375
// /// Each policy associates one or multiple rules to one or multiple subject combinations
376376
// {
377+
// /// Id is optional. If provided, it has to be unique within the policies list
378+
// "id": "policy1",
377379
// /// Rules and Subjects are identified with their unique IDs declared above
378380
// "rules": ["rule1"],
379381
// "subjects": ["subject1", "subject2"],

zenoh_cpp_vendor/CMakeLists.txt

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,25 @@ find_package(ament_cmake_vendor_package REQUIRED)
1717
# when expanded.
1818
set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memory zenoh/transport_compression zenoh/transport_tcp zenoh/transport_udp zenoh/transport_tls")
1919

20-
# Set VCS_VERSION to include latest changes from zenoh/zenoh-c/zenoh-cpp to benefit from :
21-
# - https://github.com/eclipse-zenoh/zenoh/pull/1742, https://github.com/eclipse-zenoh/zenoh/pull/1765
22-
# (Add autoconnect_strategy config allowing to optimize peers interconnections)
23-
# - https://github.com/eclipse-zenoh/zenoh/pull/1753
24-
# (Improve AdvancedSub for faster delivery of first receveived data)
25-
# - https://github.com/eclipse-zenoh/zenoh-cpp/pull/407, https://github.com/eclipse-zenoh/zenoh-c/pull/913
26-
# (Fix potential loss of request/reply messages in case of network congestion)
20+
# Set VCS_VERSION to include latest changes from zenoh/zenoh-c/zenoh-cpp to benefit from:
21+
# - Reword SHM warning log about "setting scheduling priority":
22+
# - https://github.com/eclipse-zenoh/zenoh/pull/1778
23+
# - Performances improvements at launch time:
24+
# - https://github.com/eclipse-zenoh/zenoh/pull/1786
25+
# - https://github.com/eclipse-zenoh/zenoh/pull/1789
26+
# - https://github.com/eclipse-zenoh/zenoh/pull/1793
27+
# - Fixed open timeout
28+
# - https://github.com/eclipse-zenoh/zenoh/pull/1796
29+
# - Improve ACL behaviour, notably for S-ROS
30+
# - https://github.com/eclipse-zenoh/zenoh/pull/1781
31+
# - https://github.com/eclipse-zenoh/zenoh/pull/1785
32+
# - https://github.com/eclipse-zenoh/zenoh/pull/1795
33+
# - https://github.com/eclipse-zenoh/zenoh/pull/1806
34+
# - Reduce the number of threads in case of scouting
35+
# - https://github.com/eclipse-zenoh/zenoh-c/pull/937
2736
ament_vendor(zenoh_c_vendor
2837
VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
29-
VCS_VERSION 261493682c7dc54db3a07079315e009a2e7c1573
38+
VCS_VERSION 3540a3ce8126e071236352446bc1564787d3fb04
3039
CMAKE_ARGS
3140
"-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
3241
"-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE"
@@ -37,7 +46,7 @@ ament_export_dependencies(zenohc)
3746

3847
ament_vendor(zenoh_cpp_vendor
3948
VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp
40-
VCS_VERSION 5dfb68c9ac966925e59bcb52f39b9bc26c0ad6d3
49+
VCS_VERSION 2a127bb0f537e0028359caf1084c879330341592
4150
CMAKE_ARGS
4251
-DZENOHCXX_ZENOHC=OFF
4352
)

0 commit comments

Comments
 (0)