From a8e6548952e812f42142a53bafd7b0752228c3d0 Mon Sep 17 00:00:00 2001 From: ChenYing Kuo Date: Thu, 16 Jan 2025 17:20:47 +0800 Subject: [PATCH 1/3] Bump zenoh-c and zenoh-cpp version. Signed-off-by: ChenYing Kuo --- zenoh_cpp_vendor/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt index 57c45fbb..a13b1585 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -20,9 +20,14 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memor # Set VCS_VERSION to include latest changes from zenoh/zenoh-c to benefit from : # - https://github.com/eclipse-zenoh/zenoh/pull/1685 (Fix deadlock in advanced subscription undeclaration) # - https://github.com/eclipse-zenoh/zenoh/pull/1696 (Fix SHM Garbage Collection (GC) policy) +# - https://github.com/eclipse-zenoh/zenoh/pull/1708 (Fix gossip with TLS endpoints) +# - https://github.com/eclipse-zenoh/zenoh/pull/1704 (Improve performance of a large number of peers) +# - https://github.com/eclipse-zenoh/zenoh/pull/1710 (Improve performance of a large number of peers) +# - https://github.com/eclipse-zenoh/zenoh/pull/1713 (Improve performance of a large number of peers) +# - https://github.com/eclipse-zenoh/zenoh/pull/1717 (Improve performance of a large number of peers) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION 61d8fcc136ce4ed36d921a32244da4f3d81a6097 + VCS_VERSION cdc53527c88c5d27b35fa5d4552560a06f287e44 CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE" @@ -36,7 +41,7 @@ ament_export_dependencies(zenohc) # - https://github.com/eclipse-zenoh/zenoh-cpp/pull/363 (Fix memory leak in string deserialization) ament_vendor(zenoh_cpp_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp - VCS_VERSION 05942637c29d3346ad18bab5a178aeebf4be5d62 + VCS_VERSION b216284ea0dae6bec25cb5c20e36dc4227c769fe CMAKE_ARGS -DZENOHCXX_ZENOHC=OFF ) From dbbac398ab85940b0cbad2198676294fcddf065f Mon Sep 17 00:00:00 2001 From: Julien Enoch Date: Thu, 16 Jan 2025 17:56:01 +0100 Subject: [PATCH 2/3] Bump zenoh-c and zenoh-cpp for last minute changes before 1.1.1 --- zenoh_cpp_vendor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt index a13b1585..4b399e86 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -27,7 +27,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memor # - https://github.com/eclipse-zenoh/zenoh/pull/1717 (Improve performance of a large number of peers) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION cdc53527c88c5d27b35fa5d4552560a06f287e44 + VCS_VERSION 328736fe9bb9b654b1d9f47eecfc6d52f0d7d587 CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE" @@ -41,7 +41,7 @@ ament_export_dependencies(zenohc) # - https://github.com/eclipse-zenoh/zenoh-cpp/pull/363 (Fix memory leak in string deserialization) ament_vendor(zenoh_cpp_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp - VCS_VERSION b216284ea0dae6bec25cb5c20e36dc4227c769fe + VCS_VERSION bbfef04e843289aae70b5aa060a925e8ee5b1b6f CMAKE_ARGS -DZENOHCXX_ZENOHC=OFF ) From 2dff779ab7ad1bb2f3850702418ac28a120a2860 Mon Sep 17 00:00:00 2001 From: "ChenYing Kuo (CY)" Date: Fri, 17 Jan 2025 12:22:51 +0800 Subject: [PATCH 3/3] Only keep the last PR improving performance Co-authored-by: yadunund Signed-off-by: ChenYing Kuo (CY) --- zenoh_cpp_vendor/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt index 4b399e86..75a5ee2f 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -21,9 +21,6 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memor # - https://github.com/eclipse-zenoh/zenoh/pull/1685 (Fix deadlock in advanced subscription undeclaration) # - https://github.com/eclipse-zenoh/zenoh/pull/1696 (Fix SHM Garbage Collection (GC) policy) # - https://github.com/eclipse-zenoh/zenoh/pull/1708 (Fix gossip with TLS endpoints) -# - https://github.com/eclipse-zenoh/zenoh/pull/1704 (Improve performance of a large number of peers) -# - https://github.com/eclipse-zenoh/zenoh/pull/1710 (Improve performance of a large number of peers) -# - https://github.com/eclipse-zenoh/zenoh/pull/1713 (Improve performance of a large number of peers) # - https://github.com/eclipse-zenoh/zenoh/pull/1717 (Improve performance of a large number of peers) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git