From 5e5b2bdba774ae8cad649c4097b516bd98a7f246 Mon Sep 17 00:00:00 2001 From: yuanyuyuan Date: Fri, 10 Jan 2025 00:01:46 +0800 Subject: [PATCH 1/2] chore: Update Zenoh version This version includes the following fixes: - Fix memory leak in string deserialization ([zenoh-cpp#363](https://github.com/eclipse-zenoh/zenoh-cpp/pull/363)) - Fix SHM Garbage Collection (GC) policy ([zenoh#1696](https://github.com/eclipse-zenoh/zenoh/pull/1696)) - Fix deadlock in advanced subscription undeclaration ([zenoh#1685](https://github.com/eclipse-zenoh/zenoh/pull/1685)) --- 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 2d3ae046..1361e42d 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -19,7 +19,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memor ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION 57d5e4d31d9b38fef34d7bcad3d3e54869c4ce73 + VCS_VERSION 61d8fcc136ce4ed36d921a32244da4f3d81a6097 CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE" @@ -32,7 +32,7 @@ ament_export_dependencies(zenohc) # - https://github.com/eclipse-zenoh/zenoh-cpp/pull/342 (Fix include what you use) ament_vendor(zenoh_cpp_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp - VCS_VERSION 964b64dc8b935a43147287199e7bb12da7b141e6 + VCS_VERSION 05942637c29d3346ad18bab5a178aeebf4be5d62 CMAKE_ARGS -DZENOHCXX_ZENOHC=OFF ) From ca1b82a5e91d572551452069b28894612aa1b0aa Mon Sep 17 00:00:00 2001 From: yuanyuyuan Date: Fri, 10 Jan 2025 09:38:45 +0800 Subject: [PATCH 2/2] chore: journalize the fix commits --- zenoh_cpp_vendor/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt index 1361e42d..57c45fbb 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -17,6 +17,9 @@ find_package(ament_cmake_vendor_package REQUIRED) # when expanded. set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memory zenoh/transport_compression zenoh/transport_tcp zenoh/transport_tls") +# 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) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git VCS_VERSION 61d8fcc136ce4ed36d921a32244da4f3d81a6097 @@ -28,8 +31,9 @@ ament_vendor(zenoh_c_vendor ament_export_dependencies(zenohc) -# Set VCS_VERSION to include latest changes from zenoh-c to benefit from : +# Set VCS_VERSION to include latest changes from zenoh-cpp to benefit from : # - https://github.com/eclipse-zenoh/zenoh-cpp/pull/342 (Fix include what you use) +# - 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