liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

route work

Browse Source
This commit is contained in:
John Smith 2022-12-15 18:45:41 -05:00
parent 8d80fbb228
commit e2b4e1fb76
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
veilid-core/src/routing_table/tasks/private_route_management.rs
View File

@ -14,20 +14,19 @@ impl RoutingTable {
stop_token: StopToken, stop_token: StopToken,
routes_needing_testing: Vec<DHTKey>, routes_needing_testing: Vec<DHTKey>,
) -> EyreResult<()> { ) -> EyreResult<()> {
let rss = self.route_spec_store(); if routes_needing_testing.is_empty() {
return Ok(());
}
log_rtab!(debug "Testing routes: {:?}", routes_needing_testing); log_rtab!(debug "Testing routes: {:?}", routes_needing_testing);
// Test all the routes that need testing at the same time
let rss = self.route_spec_store();
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct TestRouteContext { struct TestRouteContext {
failed: bool, failed: bool,
dead_routes: Vec<DHTKey>, dead_routes: Vec<DHTKey>,
} }
if routes_needing_testing.is_empty() {
return Ok(());
}
// Test all the routes that need testing at the same time
let mut unord = FuturesUnordered::new(); let mut unord = FuturesUnordered::new();
let ctx = Arc::new(Mutex::new(TestRouteContext::default())); let ctx = Arc::new(Mutex::new(TestRouteContext::default()));
for r in routes_needing_testing { for r in routes_needing_testing {
@ -97,8 +96,10 @@ impl RoutingTable {
return None; return None;
} }
}); });
self.test_route_set(stop_token.clone(), routes_needing_testing) if !routes_needing_testing.is_empty() {
.await?; self.test_route_set(stop_token.clone(), routes_needing_testing)
.await?;
}
// Ensure we have a minimum of N allocated local, unpublished routes with the default number of hops // Ensure we have a minimum of N allocated local, unpublished routes with the default number of hops
let default_route_hop_count = let default_route_hop_count =
@ -130,8 +131,10 @@ impl RoutingTable {
} }
// Immediately test them // Immediately test them
self.test_route_set(stop_token.clone(), newly_allocated_routes) if !newly_allocated_routes.is_empty() {
.await?; self.test_route_set(stop_token.clone(), newly_allocated_routes)
.await?;
}
} }
// Test remote routes next // Test remote routes next
@ -143,8 +146,10 @@ impl RoutingTable {
return None; return None;
} }
}); });
self.test_route_set(stop_token.clone(), remote_routes_needing_testing) if !remote_routes_needing_testing.is_empty() {
.await?; self.test_route_set(stop_token.clone(), remote_routes_needing_testing)
.await?;
}
// Send update (also may send updates for released routes done by other parts of the program) // Send update (also may send updates for released routes done by other parts of the program)
rss.send_route_update(); rss.send_route_update();