Rename TREES_COMPUTATION_DELAY constant

eclipse-zenoh · Jan 29, 2024 · 5e73775 · 5e73775
1 parent d7ed043
commit 5e73775
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/zenoh/src/net/routing/hat/client/mod.rs b/zenoh/src/net/routing/hat/client/mod.rs
@@ -52,10 +52,6 @@ use zenoh_transport::unicast::TransportUnicast;
 mod pubsub;
 mod queries;
 
-zconfigurable! {
-    static ref TREES_COMPUTATION_DELAY: u64 = 100;
-}
-
 macro_rules! face_hat {
     ($f:expr) => {
         $f.hat.downcast_ref::<HatFace>().unwrap()

diff --git a/zenoh/src/net/routing/hat/linkstate_peer/mod.rs b/zenoh/src/net/routing/hat/linkstate_peer/mod.rs
@@ -35,6 +35,7 @@ use crate::{
         protocol::linkstate::LinkStateList,
         routing::{
             dispatcher::face::Face,
+            hat::TREES_COMPUTATION_DELAY_MS,
             router::{
                 compute_data_routes, compute_matching_pulls, compute_query_routes, RoutesIndexes,
             },
@@ -61,10 +62,6 @@ mod network;
 mod pubsub;
 mod queries;
 
-zconfigurable! {
-    static ref TREES_COMPUTATION_DELAY: u64 = 100;
-}
-
 macro_rules! hat {
     ($t:expr) => {
         $t.hat.downcast_ref::<HatTables>().unwrap()
@@ -132,8 +129,10 @@ impl HatTables {
         log::trace!("Schedule computations");
         if self.peers_trees_task.is_none() {
             let task = Some(async_std::task::spawn(async move {
-                async_std::task::sleep(std::time::Duration::from_millis(*TREES_COMPUTATION_DELAY))
-                    .await;
+                async_std::task::sleep(std::time::Duration::from_millis(
+                    *TREES_COMPUTATION_DELAY_MS,
+                ))
+                .await;
                 let mut tables = zwrite!(tables_ref.tables);
 
                 log::trace!("Compute trees");

diff --git a/zenoh/src/net/routing/hat/mod.rs b/zenoh/src/net/routing/hat/mod.rs
@@ -44,7 +44,7 @@ mod p2p_peer;
 mod router;
 
 zconfigurable! {
-    static ref TREES_COMPUTATION_DELAY: u64 = 100;
+    pub static ref TREES_COMPUTATION_DELAY_MS: u64 = 100;
 }
 
 pub(crate) trait HatTrait: HatBaseTrait + HatPubSubTrait + HatQueriesTrait {}

diff --git a/zenoh/src/net/routing/hat/router/mod.rs b/zenoh/src/net/routing/hat/router/mod.rs
@@ -39,6 +39,7 @@ use crate::{
         protocol::linkstate::LinkStateList,
         routing::{
             dispatcher::face::Face,
+            hat::TREES_COMPUTATION_DELAY_MS,
             router::{
                 compute_data_routes, compute_matching_pulls, compute_query_routes, RoutesIndexes,
             },
@@ -66,10 +67,6 @@ mod network;
 mod pubsub;
 mod queries;
 
-zconfigurable! {
-    static ref TREES_COMPUTATION_DELAY: u64 = 100;
-}
-
 macro_rules! hat {
     ($t:expr) => {
         $t.hat.downcast_ref::<HatTables>().unwrap()
@@ -247,8 +244,10 @@ impl HatTables {
             || (net_type == WhatAmI::Peer && self.peers_trees_task.is_none())
         {
             let task = Some(async_std::task::spawn(async move {
-                async_std::task::sleep(std::time::Duration::from_millis(*TREES_COMPUTATION_DELAY))
-                    .await;
+                async_std::task::sleep(std::time::Duration::from_millis(
+                    *TREES_COMPUTATION_DELAY_MS,
+                ))
+                .await;
                 let mut tables = zwrite!(tables_ref.tables);
 
                 log::trace!("Compute trees");