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

Replace the current flow processing setup with a crossbeam-queue SeqQueue setup to better reuse memory and avoid thrashing.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-10-24 11:38:24 -05:00
parent cd58411390
commit 48d65be206
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rust/Cargo.lock generated
View File

@ -718,6 +718,15 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.20" version = "0.8.20"
@ -834,12 +843,11 @@ dependencies = [
[[package]] [[package]]
name = "dashmap" name = "dashmap"
version = "6.1.0" version = "5.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"crossbeam-utils",
"hashbrown", "hashbrown",
"lock_api", "lock_api",
"once_cell", "once_cell",
@ -1859,6 +1867,7 @@ dependencies = [
"axum-extra", "axum-extra",
"bincode", "bincode",
"crossbeam-channel", "crossbeam-channel",
"crossbeam-queue",
"csv", "csv",
"dashmap", "dashmap",
"default-net", "default-net",

2
src/rust/Cargo.toml
View File

@ -71,6 +71,8 @@ num-traits = "0.2.19"
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
timerfd = "1.6" timerfd = "1.6"
crossbeam-channel = { version = "0.5" } crossbeam-channel = { version = "0.5" }
crossbeam-queue = "0.3.11"
arc-swap = "1.7.1"
# May have to change this one for ARM? # May have to change this one for ARM?
jemallocator = "0.5" jemallocator = "0.5"

3
src/rust/lqosd/Cargo.toml
View File

@ -47,7 +47,8 @@ rand = "0.8.5"
mime_guess = "2.0.4" mime_guess = "2.0.4"
timerfd = { workspace = true } timerfd = { workspace = true }
crossbeam-channel = { workspace = true } crossbeam-channel = { workspace = true }
arc-swap = "1.7.1" arc-swap = { workspace = true }
crossbeam-queue = { workspace = true }
# Support JemAlloc on supported platforms # Support JemAlloc on supported platforms
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]

15
src/rust/lqosd/src/throughput_tracker/flow_data/flow_analysis/kernel_ringbuffer.rs
View File

@ -128,8 +128,9 @@ pub struct FlowActor {}
const EVENT_SIZE: usize = size_of::<FlowbeeEvent>(); const EVENT_SIZE: usize = size_of::<FlowbeeEvent>();
static FLOW_BYTES_SENDER: OnceLock<crossbeam_channel::Sender<Box<[u8; EVENT_SIZE]>>> = OnceLock::new(); static FLOW_BYTES_SENDER: OnceLock<crossbeam_channel::Sender<()>> = OnceLock::new();
static FLOW_COMMAND_SENDER: OnceLock<crossbeam_channel::Sender<FlowCommands>> = OnceLock::new(); static FLOW_COMMAND_SENDER: OnceLock<crossbeam_channel::Sender<FlowCommands>> = OnceLock::new();
static FLOW_BYTES: crossbeam_queue::SegQueue<[u8; EVENT_SIZE]> = crossbeam_queue::SegQueue::new();
#[derive(Debug)] #[derive(Debug)]
enum FlowCommands { enum FlowCommands {
@ -139,7 +140,7 @@ enum FlowCommands {
impl FlowActor { impl FlowActor {
pub fn start() -> anyhow::Result<()> { pub fn start() -> anyhow::Result<()> {
let (tx, rx) = crossbeam_channel::bounded::<Box<[u8; EVENT_SIZE]>>(65536); let (tx, rx) = crossbeam_channel::bounded::<()>(65536);
// Placeholder for when you need to read the flow system. // Placeholder for when you need to read the flow system.
let (cmd_tx, cmd_rx) = crossbeam_channel::bounded::<FlowCommands>(16); let (cmd_tx, cmd_rx) = crossbeam_channel::bounded::<FlowCommands>(16);
@ -181,8 +182,10 @@ impl FlowActor {
} }
// A flow event arrives // A flow event arrives
recv(rx) -> msg => { recv(rx) -> msg => {
if let Ok(msg) = msg { if let Ok(_) = msg {
FlowActor::receive_flow(&mut flows, msg.as_slice()); while let Some(msg) = FLOW_BYTES.pop() {
FlowActor::receive_flow(&mut flows, msg.as_slice());
}
} }
} }
} }
@ -257,8 +260,8 @@ pub unsafe extern "C" fn flowbee_handle_events(
// Copy the bytes (to free the ringbuffer slot) // Copy the bytes (to free the ringbuffer slot)
let data_u8 = data as *const u8; let data_u8 = data as *const u8;
let data_slice: &[u8] = slice::from_raw_parts(data_u8, EVENT_SIZE); let data_slice: &[u8] = slice::from_raw_parts(data_u8, EVENT_SIZE);
let target: Box<[u8; EVENT_SIZE]> = Box::new(data_slice.try_into().unwrap()); FLOW_BYTES.push(data_slice.try_into().unwrap());
if tx.try_send(target).is_err() { if tx.try_send(()).is_err() {
warn!("Could not submit flow event - buffer full"); warn!("Could not submit flow event - buffer full");
} }
} else { } else {