Replace DashSet in the network json tree with HashSet.

This commit is contained in:
Herbert Wolverson
2024-10-25 09:44:13 -05:00
parent bb49a3cb83
commit 4b36abf0bb
2 changed files with 7 additions and 7 deletions

View File

@@ -1,12 +1,12 @@
mod network_json_node;
mod network_json_transport;
use dashmap::DashSet;
use tracing::{debug, error, warn};
use serde_json::{Map, Value};
use std::{
fs, path::{Path, PathBuf},
};
use std::collections::HashSet;
use thiserror::Error;
use lqos_utils::units::DownUpOrder;
pub use network_json_node::NetworkJsonNode;
@@ -69,7 +69,7 @@ impl NetworkJson {
current_marks: DownUpOrder::zeroed(),
parents: Vec::new(),
immediate_parent: None,
rtts: DashSet::new(),
rtts: HashSet::new(),
node_type: None,
}];
if !Self::exists() {
@@ -177,10 +177,10 @@ impl NetworkJson {
/// Record RTT time in the tree. Note that due to interior mutability,
/// this does not require mutable access.
pub fn add_rtt_cycle(&self, targets: &[usize], rtt: f32) {
pub fn add_rtt_cycle(&mut self, targets: &[usize], rtt: f32) {
for idx in targets {
// Safety first: use "get" to ensure that the node exists
if let Some(node) = self.nodes.get(*idx) {
if let Some(node) = self.nodes.get_mut(*idx) {
node.rtts.insert((rtt * 100.0) as u16);
} else {
warn!("No network tree entry for index {idx}");
@@ -253,7 +253,7 @@ fn recurse_node(
current_marks: DownUpOrder::zeroed(),
name: name.to_string(),
immediate_parent: Some(immediate_parent),
rtts: DashSet::new(),
rtts: HashSet::new(),
node_type: json.get("type").map(|v| v.as_str().unwrap().to_string()),
};

View File

@@ -1,4 +1,4 @@
use dashmap::DashSet;
use std::collections::HashSet;
use lqos_utils::units::DownUpOrder;
use crate::NetworkJsonTransport;
@@ -26,7 +26,7 @@ pub struct NetworkJsonNode {
/// Approximate RTTs reported for this level of the tree.
/// It's never going to be as statistically accurate as the actual
/// numbers, being based on medians.
pub rtts: DashSet<u16>,
pub rtts: HashSet<u16>,
/// A list of indices in the `NetworkJson` vector of nodes
/// linking to parent nodes