Sync past tokio bump and drop thread restriction (#134)

* Sync past tokio bump and drop thread restriction Signed-off-by: Yadunund <[email protected]> * Bump zenoh-c to eclipse-zenoh/zenoh-c#307 * Updated zenoh-c to latest commit (#164) * updated zenoh-c to latest commit * updated zenoh-c commit comment * Updated comment in cmake --------- Signed-off-by: Yadunund <[email protected]> Co-authored-by: Julien Enoch <[email protected]> Co-authored-by: Steven Palma <[email protected]>
ros2 · May 8, 2024 · 868b64e · 868b64e
1 parent 394ae20
commit 868b64e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git a/rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_ROUTER_CONFIG.json5 b/rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_ROUTER_CONFIG.json5
@@ -189,14 +189,7 @@
         },
         // Number of threads dedicated to transmission
         // By default, the number of threads is calculated as follows: 1 + ((#cores - 1) / 4)
-        // We limit the number of threads that the zenoh session can spin to 1.
-        // Without this limit, applications with multiple zenoh sessions can
-        // encounter system resource errors when trying to create new threads.
-        // Once zenoh migrates to relying on tokio for its async runtime,
-        // see https://github.com/eclipse-zenoh/zenoh/pull/566, we can consider
-        // removing these flags since with tokio, zenoh can better manage the threads it spins
-        // with the help of thread pools.
-        threads: 1,
+        // threads: 1,
       },
       /// Configure the zenoh RX parameters of a link
       rx: {

diff --git a/rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_SESSION_CONFIG.json5 b/rmw_zenoh_cpp/config/DEFAULT_RMW_ZENOH_SESSION_CONFIG.json5
@@ -189,14 +189,7 @@
         },
         // Number of threads dedicated to transmission
         // By default, the number of threads is calculated as follows: 1 + ((#cores - 1) / 4)
-        // We limit the number of threads that the zenoh session can spin to 1.
-        // Without this limit, applications with multiple zenoh sessions can
-        // encounter system resource errors when trying to create new threads.
-        // Once zenoh migrates to relying on tokio for its async runtime,
-        // see https://github.com/eclipse-zenoh/zenoh/pull/566, we can consider
-        // removing these flags since with tokio, zenoh can better manage the threads it spins
-        // with the help of thread pools.
-        threads: 1,
+        // threads: 1,
       },
       /// Configure the zenoh RX parameters of a link
       rx: {

diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt
@@ -24,16 +24,12 @@ find_package(ament_cmake_vendor_package REQUIRED)
 # when expanded.
 set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=zenoh/transport_tcp zenoh/shared-memory")
 
-# Set VCS_VERSION to include changes from https://github.com/eclipse-zenoh/zenoh/pull/802
-# which was synced to zenoh-c in https://github.com/eclipse-zenoh/zenoh-c/pull/272.
-# Apply patches:
-# - https://github.com/eclipse-zenoh/zenoh-c/pull/301
+# Set VCS_VERSION to include latest changes from zenoh-c https://github.com/eclipse-zenoh/zenoh-c/pull/340.
 ament_vendor(zenoh_c_vendor
   VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
-  VCS_VERSION 10176b911096cb92b8ee46bc491b78079ee26c20
+  VCS_VERSION 68ab0c1faa2c3521680352778e618d95f15e2e95
   CMAKE_ARGS
     "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
-  PATCHES patches
 )
 
 # set(INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-prefix/install")
@@ -42,5 +38,4 @@ ament_vendor(zenoh_c_vendor
 #   DESTINATION "lib/${PROJECT_NAME}"
 #   USE_SOURCE_PERMISSIONS
 # )
-
 ament_package()
diff --git a/zenoh_c_vendor/patches/pr_301.patch b/zenoh_c_vendor/patches/pr_301.patch