IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "busy" flag and atomic_wait that didn't work out.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-07-09 15:30:39 -05:00
parent 78b5cfeea7
commit 360d82a22d
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/rust/Cargo.lock generated
View File

@ -232,16 +232,6 @@ dependencies = [
"bytemuck", "bytemuck",
] ]
[[package]]
name = "atomic-wait"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a55b94919229f2c42292fd71ffa4b75e83193bffdd77b1e858cd55fd2d0b0ea8"
dependencies = [
"libc",
"windows-sys 0.42.0",
]
[[package]] [[package]]
name = "atomic-waker" name = "atomic-waker"
version = "1.1.2" version = "1.1.2"
@ -1956,7 +1946,6 @@ dependencies = [
name = "lqos_config" name = "lqos_config"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"atomic-wait",
"csv", "csv",
"dashmap", "dashmap",
"ip_network", "ip_network",
@ -4408,21 +4397,6 @@ dependencies = [
"windows-targets 0.52.5", "windows-targets 0.52.5",
] ]
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.45.0" version = "0.45.0"

1
src/rust/lqos_config/Cargo.toml
View File

@ -20,4 +20,3 @@ pyo3 = "0.20"
toml = "0.8.8" toml = "0.8.8"
once_cell = "1.19.0" once_cell = "1.19.0"
lqos_utils = { path = "../lqos_utils" } lqos_utils = { path = "../lqos_utils" }
atomic-wait = "1.1.0"

9
src/rust/lqos_config/src/network_json.rs
View File

@ -30,7 +30,6 @@ pub struct NetworkJson {
/// setup makes it hard to performantly lock the whole structure - so we /// setup makes it hard to performantly lock the whole structure - so we
/// have a messy "busy" compromise. /// have a messy "busy" compromise.
nodes: Vec<NetworkJsonNode>, nodes: Vec<NetworkJsonNode>,
busy: AtomicU32,
} }
impl Default for NetworkJson { impl Default for NetworkJson {
@ -42,7 +41,7 @@ impl Default for NetworkJson {
impl NetworkJson { impl NetworkJson {
/// Generates an empty network.json /// Generates an empty network.json
pub fn new() -> Self { pub fn new() -> Self {
Self { nodes: Vec::new(), busy: AtomicU32::new(0) } Self { nodes: Vec::new() }
} }
/// The path to the current `network.json` file, determined /// The path to the current `network.json` file, determined
@ -97,7 +96,7 @@ impl NetworkJson {
} }
} }
Ok(Self { nodes, busy: AtomicU32::new(0) }) Ok(Self { nodes })
} }
/// Find the index of a circuit_id /// Find the index of a circuit_id
@ -157,7 +156,6 @@ impl NetworkJson {
/// access. /// access.
pub fn zero_throughput_and_rtt(&self) { pub fn zero_throughput_and_rtt(&self) {
//log::warn!("Locking network tree for throughput cycle"); //log::warn!("Locking network tree for throughput cycle");
self.busy.store(1, SeqCst);
self.nodes.iter().for_each(|n| { self.nodes.iter().for_each(|n| {
n.current_throughput.set_to_zero(); n.current_throughput.set_to_zero();
n.current_tcp_retransmits.set_to_zero(); n.current_tcp_retransmits.set_to_zero();
@ -168,9 +166,6 @@ impl NetworkJson {
} }
pub fn cycle_complete(&self) { pub fn cycle_complete(&self) {
//log::warn!("Unlocking network tree");
self.busy.store(0, SeqCst);
atomic_wait::wake_all(&self.busy);
} }
/// Add throughput numbers to node entries. Note that this does *not* require /// Add throughput numbers to node entries. Note that this does *not* require