Adopt the different congestion control defaults as in Rust (#407)

* Adopt the different congestion control defaults as in Rust * Fix clang-format check * Use proper internal congestion control functions * Use proper internal congestion control functions
eclipse-zenoh · Feb 13, 2025 · 5dfb68c · 5dfb68c
1 parent 1ad1415
commit 5dfb68c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/include/zenoh/api/ext/session_ext.hxx b/include/zenoh/api/ext/session_ext.hxx
@@ -275,7 +275,7 @@ class SessionExt {
             /// Number of samples to keep for each resource.
             size_t max_samples = 1;
             /// The congestion control to apply to replies.
-            zenoh::CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+            zenoh::CongestionControl congestion_control = ::z_internal_congestion_control_default_response();
             /// The priority of replies.
             zenoh::Priority priority = ::z_priority_default();
             /// If set to ``true``, this cache replies will not be batched. This usually has a positive impact on

diff --git a/include/zenoh/api/query.hxx b/include/zenoh/api/query.hxx
@@ -110,7 +110,7 @@ class Query : public Owned<::z_owned_query_t> {
         /// @brief The priority of this reply message.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing this reply message.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_response();
         /// @brief Whether Zenoh will NOT wait to batch this reply message with others to reduce the bandwith.
         bool is_express = false;
         /// @brief The timestamp of this message.
@@ -190,7 +190,7 @@ class Query : public Owned<::z_owned_query_t> {
         /// @brief The priority of this reply message.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing this reply message.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_response();
         /// @brief Whether Zenoh will NOT wait to batch this reply message with others to reduce the bandwith.
         bool is_express = false;
         /// @brief the timestamp of this message.
@@ -245,4 +245,4 @@ class Query : public Owned<::z_owned_query_t> {
 };
 
 }  // namespace zenoh
-#endif
+#endif
diff --git a/include/zenoh/api/session.hxx b/include/zenoh/api/session.hxx
@@ -177,7 +177,7 @@ class Session : public Owned<::z_owned_session_t> {
         /// @brief The priority of the get message.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing get message.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_request();
         /// @brief Whether Zenoh will NOT wait to batch get message with others to reduce the bandwith.
         bool is_express = false;
         /// @brief An optional payload of the query.
@@ -526,7 +526,7 @@ class Session : public Owned<::z_owned_session_t> {
         /// @brief The priority of the delete message.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing delete message.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_push();
         /// @brief Whether Zenoh will NOT wait to batch delete message with others to reduce the bandwith.
         bool is_express = false;
 #if defined(Z_FEATURE_UNSTABLE_API)
@@ -571,7 +571,7 @@ class Session : public Owned<::z_owned_session_t> {
         /// @brief The priority of this message.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing this message.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_push();
         /// @brief Whether Zenoh will NOT wait to batch this message with others to reduce the bandwith.
         bool is_express = false;
 #if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
@@ -640,7 +640,7 @@ class Session : public Owned<::z_owned_session_t> {
         /// @name Fields
 
         /// @brief The congestion control to apply when routing messages from this publisher.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_push();
         /// @brief The priority of messages from this publisher.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief If ``true``, Zenoh will not wait to batch this message with others to reduce the bandwith.
@@ -717,7 +717,7 @@ class Session : public Owned<::z_owned_session_t> {
         /// @brief The priority of the querier queries.
         Priority priority = Z_PRIORITY_DEFAULT;
         /// @brief The congestion control to apply when routing querier queries.
-        CongestionControl congestion_control = Z_CONGESTION_CONTROL_DEFAULT;
+        CongestionControl congestion_control = ::z_internal_congestion_control_default_request();
         /// @brief Whether Zenoh will NOT wait to batch querier queries with other messages to reduce the bandwith.
         bool is_express = false;
 #if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)

diff --git a/zenoh-c b/zenoh-c
diff --git a/zenoh-pico b/zenoh-pico
+149 −61		Cargo.lock
+1 −1		Cargo.toml
+1 −1		Cargo.toml.in
+230 −67		build-resources/opaque-types/Cargo.lock
+7 −6		build-resources/opaque-types/Cargo.toml
+15 −0		include/zenoh_commons.h
+1 −1		include/zenoh_constants.h
+1 −1		src/advanced_publisher.rs
+18 −0		src/commons.rs
+1 −1		src/get.rs
+1 −1		src/publisher.rs
+2 −2		src/put.rs
+1 −1		src/querier.rs
+2 −2		src/queryable.rs
+2 −2		.github/workflows/ci.yml
+0 −1		CMakeLists.txt
+3 −3		include/zenoh-pico.h
+12 −2		include/zenoh-pico/api/constants.h
+0 −1		include/zenoh-pico/config.h
+0 −1		include/zenoh-pico/config.h.in
+2 −2		library.json
+11 −11		src/api/api.c
+6 −3		src/collections/ring_mt.c
+3 −3		src/net/liveliness.c
+1 −1		tests/fragment.py
+2 −2		tests/z_channels_test.c
+1 −1		version.txt
+1 −1		zenohpico.pc