diff --git a/zenoh/src/net/routing/dispatcher/queries.rs b/zenoh/src/net/routing/dispatcher/queries.rs index 7b3c4b3a1e..536e811e02 100644 --- a/zenoh/src/net/routing/dispatcher/queries.rs +++ b/zenoh/src/net/routing/dispatcher/queries.rs @@ -96,11 +96,11 @@ pub(crate) fn update_query_routes(tables: &Tables, res: &Arc) { } } -pub(crate) fn compute_query_routes_from(tables: &mut Tables, res: &mut Arc) { - compute_query_routes(tables, res); +pub(crate) fn update_query_routes_from(tables: &mut Tables, res: &mut Arc) { + update_query_routes(tables, res); let res = get_mut_unchecked(res); for child in res.childs.values_mut() { - compute_query_routes_from(tables, child); + update_query_routes_from(tables, child); } } diff --git a/zenoh/src/net/routing/dispatcher/resource.rs b/zenoh/src/net/routing/dispatcher/resource.rs index 8a210ed13b..8a183088d6 100644 --- a/zenoh/src/net/routing/dispatcher/resource.rs +++ b/zenoh/src/net/routing/dispatcher/resource.rs @@ -693,7 +693,7 @@ pub fn register_expr( get_mut_unchecked(face) .remote_mappings .insert(expr_id, res.clone()); - wtables.compute_matches_routes(&mut res); + wtables.update_matches_routes(&mut res); drop(wtables); } }, diff --git a/zenoh/src/net/routing/dispatcher/tables.rs b/zenoh/src/net/routing/dispatcher/tables.rs index c8b988f99f..1b02812a39 100644 --- a/zenoh/src/net/routing/dispatcher/tables.rs +++ b/zenoh/src/net/routing/dispatcher/tables.rs @@ -145,20 +145,20 @@ impl Tables { self.faces.values().find(|face| face.zid == *zid) } - fn compute_routes(&mut self, res: &mut Arc) { + fn update_routes(&mut self, res: &mut Arc) { update_data_routes(self, res); - compute_query_routes(self, res); + update_query_routes(self, res); } - pub(crate) fn compute_matches_routes(&mut self, res: &mut Arc) { + pub(crate) fn update_matches_routes(&mut self, res: &mut Arc) { if res.context.is_some() { - self.compute_routes(res); + self.update_routes(res); let resclone = res.clone(); for match_ in &mut get_mut_unchecked(res).context_mut().matches { let match_ = &mut match_.upgrade().unwrap(); if !Arc::ptr_eq(match_, &resclone) && match_.context.is_some() { - self.compute_routes(match_); + self.update_routes(match_); } } } diff --git a/zenoh/src/net/routing/hat/linkstate_peer/queries.rs b/zenoh/src/net/routing/hat/linkstate_peer/queries.rs index e0ddf456b4..e2a1ce7a0a 100644 --- a/zenoh/src/net/routing/hat/linkstate_peer/queries.rs +++ b/zenoh/src/net/routing/hat/linkstate_peer/queries.rs @@ -726,7 +726,7 @@ pub(super) fn queries_tree_change(tables: &mut Tables, new_childs: &[Vec