From 2c7dd50ad8ce46960c4db9e9f7030a510c647355 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Sun, 5 Jan 2020 14:55:01 -0500 Subject: [PATCH 1/5] Display weighted average of bandwidth --- src/display/components/table.rs | 4 +- src/display/ui.rs | 2 +- src/display/ui_state.rs | 85 ++++++++++++++++++++++++++++----- 3 files changed, 76 insertions(+), 15 deletions(-) diff --git a/src/display/components/table.rs b/src/display/components/table.rs index 2b823d7fc..ae29d3cca 100644 --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -23,8 +23,8 @@ const THIRD_COLUMN_WIDTHS: [u16; 4] = [20, 20, 20, 20]; fn display_upload_and_download(bandwidth: &impl Bandwidth) -> String { format!( "{} / {}", - DisplayBandwidth(bandwidth.get_total_bytes_uploaded() as f64), - DisplayBandwidth(bandwidth.get_total_bytes_downloaded() as f64) + DisplayBandwidth(bandwidth.get_avg_bytes_uploaded() as f64), + DisplayBandwidth(bandwidth.get_avg_bytes_downloaded() as f64) ) } diff --git a/src/display/ui.rs b/src/display/ui.rs index e61f5e7af..62dfb2ac0 100644 --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -98,7 +98,7 @@ where utilization: Utilization, ip_to_host: HashMap, ) { - self.state = UIState::new(connections_to_procs, utilization); + self.state = UIState::new(connections_to_procs, utilization, &self.state); self.ip_to_host = ip_to_host; } pub fn end(&mut self) { diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs index acbd04fe2..290f97236 100644 --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -3,15 +3,22 @@ use ::std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; use crate::network::{Connection, LocalSocket, Utilization}; +static BANDWIDTH_DECAY_FACTOR: f32 = 0.5; + pub trait Bandwidth { fn get_total_bytes_downloaded(&self) -> u128; fn get_total_bytes_uploaded(&self) -> u128; + + fn get_avg_bytes_downloaded(&self) -> u128; + fn get_avg_bytes_uploaded(&self) -> u128; } #[derive(Default)] pub struct NetworkData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, + pub prev_total_bytes_downloaded: u128, + pub prev_total_bytes_uploaded: u128, pub connection_count: u128, } @@ -19,6 +26,8 @@ pub struct NetworkData { pub struct ConnectionData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, + pub prev_total_bytes_downloaded: u128, + pub prev_total_bytes_uploaded: u128, pub process_name: String, pub interface_name: String, } @@ -30,6 +39,24 @@ impl Bandwidth for ConnectionData { fn get_total_bytes_downloaded(&self) -> u128 { self.total_bytes_downloaded } + fn get_avg_bytes_uploaded(&self) -> u128 { + if self.prev_total_bytes_uploaded == 0 { + self.total_bytes_uploaded + } else { + (self.prev_total_bytes_uploaded as f32 * BANDWIDTH_DECAY_FACTOR + + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_uploaded as f32) + as u128 + } + } + fn get_avg_bytes_downloaded(&self) -> u128 { + if self.prev_total_bytes_downloaded == 0 { + self.total_bytes_downloaded + } else { + (self.prev_total_bytes_downloaded as f32 * BANDWIDTH_DECAY_FACTOR + + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_downloaded as f32) + as u128 + } + } } impl Bandwidth for NetworkData { @@ -39,6 +66,24 @@ impl Bandwidth for NetworkData { fn get_total_bytes_downloaded(&self) -> u128 { self.total_bytes_downloaded } + fn get_avg_bytes_uploaded(&self) -> u128 { + if self.prev_total_bytes_uploaded == 0 { + self.total_bytes_uploaded + } else { + (self.prev_total_bytes_uploaded as f32 * BANDWIDTH_DECAY_FACTOR + + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_uploaded as f32) + as u128 + } + } + fn get_avg_bytes_downloaded(&self) -> u128 { + if self.prev_total_bytes_downloaded == 0 { + self.total_bytes_downloaded + } else { + (self.prev_total_bytes_downloaded as f32 * BANDWIDTH_DECAY_FACTOR + + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_downloaded as f32) + as u128 + } + } } #[derive(Default)] @@ -74,6 +119,7 @@ impl UIState { pub fn new( connections_to_procs: HashMap, network_utilization: Utilization, + old_state: &UIState, ) -> Self { let mut processes: BTreeMap = BTreeMap::new(); let mut remote_addresses: BTreeMap = BTreeMap::new(); @@ -82,18 +128,6 @@ impl UIState { let mut total_bytes_uploaded: u128 = 0; for (connection, connection_info) in network_utilization.connections { let connection_data = connections.entry(connection).or_default(); - - if let Some(process_name) = - UIState::get_proc_name(&connections_to_procs, &connection.local_socket) - { - let data_for_process = processes.entry(process_name.clone()).or_default(); - data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; - data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; - data_for_process.connection_count += 1; - connection_data.process_name = process_name.clone(); - } else { - connection_data.process_name = String::from(""); - } let data_for_remote_address = remote_addresses .entry(connection.remote_socket.ip) .or_default(); @@ -106,6 +140,33 @@ impl UIState { data_for_remote_address.connection_count += 1; total_bytes_downloaded += connection_info.total_bytes_downloaded; total_bytes_uploaded += connection_info.total_bytes_uploaded; + + if let Some(process_name) = + UIState::get_proc_name(&connections_to_procs, &connection.local_socket) + { + let data_for_process = processes.entry(process_name.clone()).or_default(); + data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; + data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; + data_for_process.connection_count += 1; + connection_data.process_name = process_name.clone(); + // Record bandwidth data of last iteration + if let Some(prev_connection_info) = old_state.connections.get(&connection) { + // Using previous round's weighted average. Exponential decay + let prev_bytes_downloaded = prev_connection_info.get_avg_bytes_downloaded(); + let prev_bytes_uploaded = prev_connection_info.get_avg_bytes_uploaded(); + + connection_data.prev_total_bytes_downloaded += prev_bytes_downloaded; + connection_data.prev_total_bytes_uploaded += prev_bytes_uploaded; + + data_for_process.prev_total_bytes_downloaded += prev_bytes_downloaded; + data_for_process.prev_total_bytes_uploaded += prev_bytes_uploaded; + + data_for_remote_address.prev_total_bytes_downloaded += prev_bytes_downloaded; + data_for_remote_address.prev_total_bytes_uploaded += prev_bytes_uploaded; + } + } else { + connection_data.process_name = String::from(""); + } } UIState { processes, From 36d25e7b57a7617211cac729dfbc0424d4fa3578 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Sun, 5 Jan 2020 17:40:47 -0500 Subject: [PATCH 2/5] Update UI snapshots for new bandwidth calculation --- src/display/ui_state.rs | 47 ++++++++----------- .../snapshots/ui__no_resolve_mode-2.snap | 5 ++ ...ned_traffic_from_multiple_processes-2.snap | 5 ++ ...m_multiple_processes_bi_directional-2.snap | 5 ++ ..._sustained_traffic_from_one_process-2.snap | 4 ++ .../ui__traffic_with_host_names-2.snap | 5 ++ 6 files changed, 43 insertions(+), 28 deletions(-) diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs index 290f97236..a5bdfcb55 100644 --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -32,6 +32,15 @@ pub struct ConnectionData { pub interface_name: String, } +fn calc_avg_bandwidth(prev_bandwidth: u128, curr_bandwidth: u128) -> u128 { + if prev_bandwidth == 0 { + curr_bandwidth + } else { + (prev_bandwidth as f32 * BANDWIDTH_DECAY_FACTOR + + (1.0 - BANDWIDTH_DECAY_FACTOR) * curr_bandwidth as f32) as u128 + } +} + impl Bandwidth for ConnectionData { fn get_total_bytes_uploaded(&self) -> u128 { self.total_bytes_uploaded @@ -40,22 +49,13 @@ impl Bandwidth for ConnectionData { self.total_bytes_downloaded } fn get_avg_bytes_uploaded(&self) -> u128 { - if self.prev_total_bytes_uploaded == 0 { - self.total_bytes_uploaded - } else { - (self.prev_total_bytes_uploaded as f32 * BANDWIDTH_DECAY_FACTOR - + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_uploaded as f32) - as u128 - } + calc_avg_bandwidth(self.prev_total_bytes_uploaded, self.total_bytes_uploaded) } fn get_avg_bytes_downloaded(&self) -> u128 { - if self.prev_total_bytes_downloaded == 0 { - self.total_bytes_downloaded - } else { - (self.prev_total_bytes_downloaded as f32 * BANDWIDTH_DECAY_FACTOR - + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_downloaded as f32) - as u128 - } + calc_avg_bandwidth( + self.prev_total_bytes_downloaded, + self.total_bytes_downloaded, + ) } } @@ -67,22 +67,13 @@ impl Bandwidth for NetworkData { self.total_bytes_downloaded } fn get_avg_bytes_uploaded(&self) -> u128 { - if self.prev_total_bytes_uploaded == 0 { - self.total_bytes_uploaded - } else { - (self.prev_total_bytes_uploaded as f32 * BANDWIDTH_DECAY_FACTOR - + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_uploaded as f32) - as u128 - } + calc_avg_bandwidth(self.prev_total_bytes_uploaded, self.total_bytes_uploaded) } fn get_avg_bytes_downloaded(&self) -> u128 { - if self.prev_total_bytes_downloaded == 0 { - self.total_bytes_downloaded - } else { - (self.prev_total_bytes_downloaded as f32 * BANDWIDTH_DECAY_FACTOR - + (1.0 - BANDWIDTH_DECAY_FACTOR) * self.total_bytes_downloaded as f32) - as u128 - } + calc_avg_bandwidth( + self.prev_total_bytes_downloaded, + self.total_bytes_downloaded, + ) } } diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap index 857fa2451..5f83849af 100644 --- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap @@ -30,8 +30,13 @@ expression: "&terminal_draw_events_mirror[2]" +<<<<<<< HEAD 3 3 3 3 32 46 1 1 1 1 7 6 +======= + 3 3 3 3 33 4 + 1 1 1 1 47 48 +>>>>>>> Update UI snapshots for new bandwidth calculation diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap index a7e7af830..d3974f035 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap @@ -30,8 +30,13 @@ expression: "&terminal_draw_events_mirror[2]" +<<<<<<< HEAD 61 51 +======= + 52 + 45 +>>>>>>> Update UI snapshots for new bandwidth calculation diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap index 857fa2451..5f83849af 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap @@ -30,8 +30,13 @@ expression: "&terminal_draw_events_mirror[2]" +<<<<<<< HEAD 3 3 3 3 32 46 1 1 1 1 7 6 +======= + 3 3 3 3 33 4 + 1 1 1 1 47 48 +>>>>>>> Update UI snapshots for new bandwidth calculation diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap index 7ea883c0d..5c61f1e41 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap @@ -30,7 +30,11 @@ expression: "&terminal_draw_events_mirror[2]" +<<<<<<< HEAD 51 +======= + 7 +>>>>>>> Update UI snapshots for new bandwidth calculation diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap index 712bc0b3f..bba3e700e 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap @@ -30,8 +30,13 @@ expression: "&terminal_draw_events_mirror[2]" +<<<<<<< HEAD three.thre three.three 32 46 one.one.on one 7 6 +======= + three.thre three.three 33 4 + one.one.on one 47 48 +>>>>>>> Update UI snapshots for new bandwidth calculation From f6d1fc60853a80fe282604b34e1d2bf3afee2cfb Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Sun, 12 Jan 2020 13:49:45 +0100 Subject: [PATCH 3/5] suggestion for previous state storage and calculation --- src/display/ui.rs | 4 +- src/display/ui_state.rs | 119 +++++++++++++++++++++++----------------- 2 files changed, 72 insertions(+), 51 deletions(-) diff --git a/src/display/ui.rs b/src/display/ui.rs index 62dfb2ac0..dd8ecfb62 100644 --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -98,8 +98,8 @@ where utilization: Utilization, ip_to_host: HashMap, ) { - self.state = UIState::new(connections_to_procs, utilization, &self.state); - self.ip_to_host = ip_to_host; + self.state.update(connections_to_procs, utilization); + self.ip_to_host.extend(ip_to_host); } pub fn end(&mut self) { self.terminal.clear().unwrap(); diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs index a5bdfcb55..4b420394f 100644 --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -1,9 +1,10 @@ -use ::std::collections::{BTreeMap, HashMap}; +use ::std::collections::{BTreeMap, HashMap, VecDeque}; use ::std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; use crate::network::{Connection, LocalSocket, Utilization}; static BANDWIDTH_DECAY_FACTOR: f32 = 0.5; +static RECALL_LENGTH: usize = 5; pub trait Bandwidth { fn get_total_bytes_downloaded(&self) -> u128; @@ -32,6 +33,20 @@ pub struct ConnectionData { pub interface_name: String, } +impl NetworkData { + pub fn divide_by(&mut self, amount: usize) { + self.total_bytes_downloaded = self.total_bytes_downloaded / amount as u128; + self.total_bytes_uploaded = self.total_bytes_uploaded / amount as u128; + } +} + +impl ConnectionData { + pub fn divide_by(&mut self, amount: usize) { + self.total_bytes_downloaded = self.total_bytes_downloaded / amount as u128; + self.total_bytes_uploaded = self.total_bytes_uploaded / amount as u128; + } +} + fn calc_avg_bandwidth(prev_bandwidth: u128, curr_bandwidth: u128) -> u128 { if prev_bandwidth == 0 { curr_bandwidth @@ -77,6 +92,11 @@ impl Bandwidth for NetworkData { } } +pub struct UtilizationData { + connections_to_procs: HashMap, + network_utilization: Utilization, +} + #[derive(Default)] pub struct UIState { pub processes: BTreeMap, @@ -84,7 +104,8 @@ pub struct UIState { pub connections: BTreeMap, pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, -} + utilization_data: VecDeque, + } impl UIState { fn get_proc_name<'a>( @@ -107,64 +128,64 @@ impl UIState { }) } } - pub fn new( + pub fn update( + &mut self, connections_to_procs: HashMap, network_utilization: Utilization, - old_state: &UIState, - ) -> Self { + ) { + self.utilization_data.push_back(UtilizationData { connections_to_procs, network_utilization }); + if self.utilization_data.len() > RECALL_LENGTH { + self.utilization_data.pop_front(); + } let mut processes: BTreeMap = BTreeMap::new(); let mut remote_addresses: BTreeMap = BTreeMap::new(); let mut connections: BTreeMap = BTreeMap::new(); let mut total_bytes_downloaded: u128 = 0; let mut total_bytes_uploaded: u128 = 0; - for (connection, connection_info) in network_utilization.connections { - let connection_data = connections.entry(connection).or_default(); - let data_for_remote_address = remote_addresses - .entry(connection.remote_socket.ip) - .or_default(); - connection_data.total_bytes_downloaded += connection_info.total_bytes_downloaded; - connection_data.total_bytes_uploaded += connection_info.total_bytes_uploaded; - connection_data.interface_name = connection_info.interface_name; - data_for_remote_address.total_bytes_downloaded += - connection_info.total_bytes_downloaded; - data_for_remote_address.total_bytes_uploaded += connection_info.total_bytes_uploaded; - data_for_remote_address.connection_count += 1; - total_bytes_downloaded += connection_info.total_bytes_downloaded; - total_bytes_uploaded += connection_info.total_bytes_uploaded; + for state in self.utilization_data.iter().rev() { + let connections_to_procs = &state.connections_to_procs; + let network_utilization = &state.network_utilization; + for (connection, connection_info) in &network_utilization.connections { + let connection_data = connections.entry(connection.clone()).or_default(); + let data_for_remote_address = remote_addresses + .entry(connection.remote_socket.ip) + .or_default(); + connection_data.total_bytes_downloaded += connection_info.total_bytes_downloaded; + connection_data.total_bytes_uploaded += connection_info.total_bytes_uploaded; + connection_data.interface_name = connection_info.interface_name.clone(); + data_for_remote_address.total_bytes_downloaded += + connection_info.total_bytes_downloaded; + data_for_remote_address.total_bytes_uploaded += connection_info.total_bytes_uploaded; + data_for_remote_address.connection_count += 1; + total_bytes_downloaded += connection_info.total_bytes_downloaded; + total_bytes_uploaded += connection_info.total_bytes_uploaded; - if let Some(process_name) = - UIState::get_proc_name(&connections_to_procs, &connection.local_socket) - { - let data_for_process = processes.entry(process_name.clone()).or_default(); - data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; - data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; - data_for_process.connection_count += 1; - connection_data.process_name = process_name.clone(); - // Record bandwidth data of last iteration - if let Some(prev_connection_info) = old_state.connections.get(&connection) { - // Using previous round's weighted average. Exponential decay - let prev_bytes_downloaded = prev_connection_info.get_avg_bytes_downloaded(); - let prev_bytes_uploaded = prev_connection_info.get_avg_bytes_uploaded(); - - connection_data.prev_total_bytes_downloaded += prev_bytes_downloaded; - connection_data.prev_total_bytes_uploaded += prev_bytes_uploaded; - - data_for_process.prev_total_bytes_downloaded += prev_bytes_downloaded; - data_for_process.prev_total_bytes_uploaded += prev_bytes_uploaded; - - data_for_remote_address.prev_total_bytes_downloaded += prev_bytes_downloaded; - data_for_remote_address.prev_total_bytes_uploaded += prev_bytes_uploaded; + if let Some(process_name) = + UIState::get_proc_name(&connections_to_procs, &connection.local_socket) + { + let data_for_process = processes.entry(process_name.clone()).or_default(); + data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; + data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; + data_for_process.connection_count += 1; + connection_data.process_name = process_name.clone(); + } else { + connection_data.process_name = String::from(""); } - } else { - connection_data.process_name = String::from(""); } } - UIState { - processes, - remote_addresses, - connections, - total_bytes_downloaded, - total_bytes_uploaded, + for (_, network_data) in processes.iter_mut() { + network_data.divide_by(self.utilization_data.len()) + } + for (_, network_data) in remote_addresses.iter_mut() { + network_data.divide_by(self.utilization_data.len()) + } + for (_, connection_data) in connections.iter_mut() { + connection_data.divide_by(self.utilization_data.len()) } + self.processes = processes; + self.remote_addresses = remote_addresses; + self.connections = connections; + self.total_bytes_downloaded = total_bytes_downloaded; + self.total_bytes_uploaded = total_bytes_uploaded; } } From 414dd764e713fe4f2223bbf1479de0e07ec901f2 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Sun, 12 Jan 2020 10:08:16 -0500 Subject: [PATCH 4/5] Fix formatting issue, remove deadcode --- src/display/components/table.rs | 4 +-- src/display/ui_state.rs | 56 ++++++++------------------------- 2 files changed, 15 insertions(+), 45 deletions(-) diff --git a/src/display/components/table.rs b/src/display/components/table.rs index ae29d3cca..2b823d7fc 100644 --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -23,8 +23,8 @@ const THIRD_COLUMN_WIDTHS: [u16; 4] = [20, 20, 20, 20]; fn display_upload_and_download(bandwidth: &impl Bandwidth) -> String { format!( "{} / {}", - DisplayBandwidth(bandwidth.get_avg_bytes_uploaded() as f64), - DisplayBandwidth(bandwidth.get_avg_bytes_downloaded() as f64) + DisplayBandwidth(bandwidth.get_total_bytes_uploaded() as f64), + DisplayBandwidth(bandwidth.get_total_bytes_downloaded() as f64) ) } diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs index 4b420394f..7a22c6d02 100644 --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -3,23 +3,17 @@ use ::std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; use crate::network::{Connection, LocalSocket, Utilization}; -static BANDWIDTH_DECAY_FACTOR: f32 = 0.5; static RECALL_LENGTH: usize = 5; pub trait Bandwidth { fn get_total_bytes_downloaded(&self) -> u128; fn get_total_bytes_uploaded(&self) -> u128; - - fn get_avg_bytes_downloaded(&self) -> u128; - fn get_avg_bytes_uploaded(&self) -> u128; } #[derive(Default)] pub struct NetworkData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, - pub prev_total_bytes_downloaded: u128, - pub prev_total_bytes_uploaded: u128, pub connection_count: u128, } @@ -27,32 +21,21 @@ pub struct NetworkData { pub struct ConnectionData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, - pub prev_total_bytes_downloaded: u128, - pub prev_total_bytes_uploaded: u128, pub process_name: String, pub interface_name: String, } impl NetworkData { pub fn divide_by(&mut self, amount: usize) { - self.total_bytes_downloaded = self.total_bytes_downloaded / amount as u128; - self.total_bytes_uploaded = self.total_bytes_uploaded / amount as u128; + self.total_bytes_downloaded /= amount as u128; + self.total_bytes_uploaded /= amount as u128; } } impl ConnectionData { pub fn divide_by(&mut self, amount: usize) { - self.total_bytes_downloaded = self.total_bytes_downloaded / amount as u128; - self.total_bytes_uploaded = self.total_bytes_uploaded / amount as u128; - } -} - -fn calc_avg_bandwidth(prev_bandwidth: u128, curr_bandwidth: u128) -> u128 { - if prev_bandwidth == 0 { - curr_bandwidth - } else { - (prev_bandwidth as f32 * BANDWIDTH_DECAY_FACTOR - + (1.0 - BANDWIDTH_DECAY_FACTOR) * curr_bandwidth as f32) as u128 + self.total_bytes_downloaded /= amount as u128; + self.total_bytes_uploaded /= amount as u128; } } @@ -63,15 +46,6 @@ impl Bandwidth for ConnectionData { fn get_total_bytes_downloaded(&self) -> u128 { self.total_bytes_downloaded } - fn get_avg_bytes_uploaded(&self) -> u128 { - calc_avg_bandwidth(self.prev_total_bytes_uploaded, self.total_bytes_uploaded) - } - fn get_avg_bytes_downloaded(&self) -> u128 { - calc_avg_bandwidth( - self.prev_total_bytes_downloaded, - self.total_bytes_downloaded, - ) - } } impl Bandwidth for NetworkData { @@ -81,15 +55,6 @@ impl Bandwidth for NetworkData { fn get_total_bytes_downloaded(&self) -> u128 { self.total_bytes_downloaded } - fn get_avg_bytes_uploaded(&self) -> u128 { - calc_avg_bandwidth(self.prev_total_bytes_uploaded, self.total_bytes_uploaded) - } - fn get_avg_bytes_downloaded(&self) -> u128 { - calc_avg_bandwidth( - self.prev_total_bytes_downloaded, - self.total_bytes_downloaded, - ) - } } pub struct UtilizationData { @@ -105,7 +70,7 @@ pub struct UIState { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, utilization_data: VecDeque, - } +} impl UIState { fn get_proc_name<'a>( @@ -133,7 +98,10 @@ impl UIState { connections_to_procs: HashMap, network_utilization: Utilization, ) { - self.utilization_data.push_back(UtilizationData { connections_to_procs, network_utilization }); + self.utilization_data.push_back(UtilizationData { + connections_to_procs, + network_utilization, + }); if self.utilization_data.len() > RECALL_LENGTH { self.utilization_data.pop_front(); } @@ -155,7 +123,8 @@ impl UIState { connection_data.interface_name = connection_info.interface_name.clone(); data_for_remote_address.total_bytes_downloaded += connection_info.total_bytes_downloaded; - data_for_remote_address.total_bytes_uploaded += connection_info.total_bytes_uploaded; + data_for_remote_address.total_bytes_uploaded += + connection_info.total_bytes_uploaded; data_for_remote_address.connection_count += 1; total_bytes_downloaded += connection_info.total_bytes_downloaded; total_bytes_uploaded += connection_info.total_bytes_uploaded; @@ -164,7 +133,8 @@ impl UIState { UIState::get_proc_name(&connections_to_procs, &connection.local_socket) { let data_for_process = processes.entry(process_name.clone()).or_default(); - data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; + data_for_process.total_bytes_downloaded += + connection_info.total_bytes_downloaded; data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; data_for_process.connection_count += 1; connection_data.process_name = process_name.clone(); From 358e3f0d54f429581e2d0dde001d9294ae679fcf Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Sun, 12 Jan 2020 17:00:59 +0100 Subject: [PATCH 5/5] test(snapshots): update to new formula --- .../raw_mode__bi_directional_traffic.snap | 6 ++--- ...tiple_connections_from_remote_address.snap | 8 +++---- ...of_traffic_from_different_connections.snap | 10 ++++---- ...ets_of_traffic_from_single_connection.snap | 6 ++--- ...e_processes_with_multiple_connections.snap | 24 +++++++++---------- .../snapshots/raw_mode__no_resolve_mode.snap | 24 +++++++++---------- .../raw_mode__one_ip_packet_of_traffic.snap | 6 ++--- .../raw_mode__one_packet_of_traffic.snap | 6 ++--- ...one_process_with_multiple_connections.snap | 8 +++---- ...ained_traffic_from_multiple_processes.snap | 24 +++++++++---------- ...rom_multiple_processes_bi_directional.snap | 24 +++++++++---------- ...e__sustained_traffic_from_one_process.snap | 12 +++++----- .../raw_mode__traffic_with_host_names.snap | 24 +++++++++---------- .../ui__bi_directional_traffic-2.snap | 4 ++-- ...__layout_full_width_under_30_height-2.snap | 8 +++---- ..._layout_under_120_width_full_height-2.snap | 16 ++++++------- ...out_under_120_width_under_30_height-2.snap | 8 +++---- ..._layout_under_150_width_full_height-2.snap | 16 ++++++------- ...out_under_150_width_under_30_height-2.snap | 8 +++---- ...ple_connections_from_remote_address-2.snap | 6 ++--- ..._traffic_from_different_connections-2.snap | 6 ++--- ...s_of_traffic_from_single_connection-2.snap | 4 ++-- ...processes_with_multiple_connections-2.snap | 16 ++++++------- .../snapshots/ui__no_resolve_mode-2.snap | 15 ++++-------- .../cases/snapshots/ui__no_resolve_mode.snap | 8 +++---- .../ui__one_packet_of_traffic-2.snap | 4 ++-- ...e_process_with_multiple_connections-2.snap | 6 ++--- ...ned_traffic_from_multiple_processes-2.snap | 15 ++++-------- ...ained_traffic_from_multiple_processes.snap | 8 +++---- ...m_multiple_processes_bi_directional-2.snap | 15 ++++-------- ...rom_multiple_processes_bi_directional.snap | 8 +++---- ..._sustained_traffic_from_one_process-2.snap | 10 +++----- ...i__sustained_traffic_from_one_process.snap | 4 ++-- .../ui__traffic_with_host_names-2.snap | 15 ++++-------- .../ui__traffic_with_host_names.snap | 8 +++---- .../ui__traffic_with_winch_event-3.snap | 4 ++-- 36 files changed, 185 insertions(+), 209 deletions(-) diff --git a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap index c85c6f909..ff5c6df96 100644 --- a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap @@ -2,7 +2,7 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 49/51 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 49/51 process: "1" -remote_address: 1.1.1.1 up/down Bps: 49/51 connections: 1 +process: "1" up/down Bps: 24/25 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 24/25 process: "1" +remote_address: 1.1.1.1 up/down Bps: 24/25 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap index bb165d157..22cb71f21 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap @@ -2,8 +2,8 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/95 connections: 2 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "1" -remote_address: 1.1.1.1 up/down Bps: 0/95 connections: 2 +process: "1" up/down Bps: 0/47 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/22 process: "1" +connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/25 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/47 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap index ce51ab23b..d5defc24e 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap @@ -2,9 +2,9 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -process: "4" up/down Bps: 0/39 connections: 1 -connection: :443 => 2.2.2.2:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" -remote_address: 2.2.2.2 up/down Bps: 0/83 connections: 2 +process: "1" up/down Bps: 0/22 connections: 1 +process: "4" up/down Bps: 0/19 connections: 1 +connection: :443 => 2.2.2.2:12345 (tcp) up/down Bps: 0/22 process: "1" +connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/19 process: "4" +remote_address: 2.2.2.2 up/down Bps: 0/41 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap index cbbdc0a1b..91bf8b891 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap @@ -2,7 +2,7 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/91 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/91 process: "1" -remote_address: 1.1.1.1 up/down Bps: 0/91 connections: 1 +process: "1" up/down Bps: 0/45 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/45 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/45 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap index e359b8c3b..609bbf54c 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap @@ -2,16 +2,16 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -process: "2" up/down Bps: 0/42 connections: 1 -process: "4" up/down Bps: 0/53 connections: 1 -process: "5" up/down Bps: 0/45 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" -connection: :4432 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" -remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 -remote_address: 2.2.2.2 up/down Bps: 0/53 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 0/45 connections: 1 -remote_address: 4.4.4.4 up/down Bps: 0/42 connections: 1 +process: "1" up/down Bps: 0/22 connections: 1 +process: "2" up/down Bps: 0/21 connections: 1 +process: "4" up/down Bps: 0/26 connections: 1 +process: "5" up/down Bps: 0/22 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/22 process: "1" +connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/26 process: "4" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/22 process: "5" +connection: :4432 => 4.4.4.4:1337 (tcp) up/down Bps: 0/21 process: "2" +remote_address: 1.1.1.1 up/down Bps: 0/22 connections: 1 +remote_address: 2.2.2.2 up/down Bps: 0/26 connections: 1 +remote_address: 3.3.3.3 up/down Bps: 0/22 connections: 1 +remote_address: 4.4.4.4 up/down Bps: 0/21 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap index 90291e904..c4b987723 100644 --- a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap @@ -2,16 +2,16 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 57/61 connections: 1 -process: "5" up/down Bps: 34/37 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" -remote_address: 1.1.1.1 up/down Bps: 57/61 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 34/37 connections: 1 -process: "1" up/down Bps: 37/36 connections: 1 -process: "5" up/down Bps: 32/46 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" -remote_address: 1.1.1.1 up/down Bps: 37/36 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 32/46 connections: 1 +process: "1" up/down Bps: 28/30 connections: 1 +process: "5" up/down Bps: 17/18 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 28/30 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 17/18 process: "5" +remote_address: 1.1.1.1 up/down Bps: 28/30 connections: 1 +remote_address: 3.3.3.3 up/down Bps: 17/18 connections: 1 +process: "1" up/down Bps: 31/32 connections: 2 +process: "5" up/down Bps: 22/27 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 31/32 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 22/27 process: "5" +remote_address: 1.1.1.1 up/down Bps: 31/32 connections: 2 +remote_address: 3.3.3.3 up/down Bps: 22/27 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__one_ip_packet_of_traffic.snap b/src/tests/cases/snapshots/raw_mode__one_ip_packet_of_traffic.snap index f5b78d93f..6ed439b51 100644 --- a/src/tests/cases/snapshots/raw_mode__one_ip_packet_of_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__one_ip_packet_of_traffic.snap @@ -2,7 +2,7 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 42/0 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" -remote_address: 1.1.1.1 up/down Bps: 42/0 connections: 1 +process: "1" up/down Bps: 21/0 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 21/0 process: "1" +remote_address: 1.1.1.1 up/down Bps: 21/0 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap index f5b78d93f..6ed439b51 100644 --- a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap @@ -2,7 +2,7 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 42/0 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" -remote_address: 1.1.1.1 up/down Bps: 42/0 connections: 1 +process: "1" up/down Bps: 21/0 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 21/0 process: "1" +remote_address: 1.1.1.1 up/down Bps: 21/0 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap index a6087fe2e..cf08105db 100644 --- a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap @@ -2,8 +2,8 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/92 connections: 2 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/48 process: "1" -remote_address: 1.1.1.1 up/down Bps: 0/92 connections: 2 +process: "1" up/down Bps: 0/46 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/22 process: "1" +connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/24 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/46 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap index 488e50a96..b5a75c74c 100644 --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap @@ -2,16 +2,16 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -process: "5" up/down Bps: 0/39 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" -remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 0/39 connections: 1 -process: "1" up/down Bps: 0/61 connections: 1 -process: "5" up/down Bps: 0/51 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" -remote_address: 1.1.1.1 up/down Bps: 0/61 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 0/51 connections: 1 +process: "1" up/down Bps: 0/22 connections: 1 +process: "5" up/down Bps: 0/19 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/22 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/19 process: "5" +remote_address: 1.1.1.1 up/down Bps: 0/22 connections: 1 +remote_address: 3.3.3.3 up/down Bps: 0/19 connections: 1 +process: "1" up/down Bps: 0/35 connections: 2 +process: "5" up/down Bps: 0/30 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/35 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/30 process: "5" +remote_address: 1.1.1.1 up/down Bps: 0/35 connections: 2 +remote_address: 3.3.3.3 up/down Bps: 0/30 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap index 90291e904..c4b987723 100644 --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -2,16 +2,16 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 57/61 connections: 1 -process: "5" up/down Bps: 34/37 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" -remote_address: 1.1.1.1 up/down Bps: 57/61 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 34/37 connections: 1 -process: "1" up/down Bps: 37/36 connections: 1 -process: "5" up/down Bps: 32/46 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" -remote_address: 1.1.1.1 up/down Bps: 37/36 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 32/46 connections: 1 +process: "1" up/down Bps: 28/30 connections: 1 +process: "5" up/down Bps: 17/18 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 28/30 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 17/18 process: "5" +remote_address: 1.1.1.1 up/down Bps: 28/30 connections: 1 +remote_address: 3.3.3.3 up/down Bps: 17/18 connections: 1 +process: "1" up/down Bps: 31/32 connections: 2 +process: "5" up/down Bps: 22/27 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 31/32 process: "1" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 22/27 process: "5" +remote_address: 1.1.1.1 up/down Bps: 31/32 connections: 2 +remote_address: 3.3.3.3 up/down Bps: 22/27 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap index 393bd1471..b86d4c101 100644 --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap @@ -2,10 +2,10 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 -process: "1" up/down Bps: 0/51 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/51 process: "1" -remote_address: 1.1.1.1 up/down Bps: 0/51 connections: 1 +process: "1" up/down Bps: 0/22 connections: 1 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/22 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/22 connections: 1 +process: "1" up/down Bps: 0/31 connections: 2 +connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/31 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/31 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap index 80b85a70a..bb5f00d75 100644 --- a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap @@ -2,16 +2,16 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 57/61 connections: 1 -process: "5" up/down Bps: 34/37 connections: 1 -connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" -remote_address: one.one.one.one up/down Bps: 57/61 connections: 1 -remote_address: three.three.three.three up/down Bps: 34/37 connections: 1 -process: "1" up/down Bps: 37/36 connections: 1 -process: "5" up/down Bps: 32/46 connections: 1 -connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" -remote_address: one.one.one.one up/down Bps: 37/36 connections: 1 -remote_address: three.three.three.three up/down Bps: 32/46 connections: 1 +process: "1" up/down Bps: 28/30 connections: 1 +process: "5" up/down Bps: 17/18 connections: 1 +connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 28/30 process: "1" +connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 17/18 process: "5" +remote_address: one.one.one.one up/down Bps: 28/30 connections: 1 +remote_address: three.three.three.three up/down Bps: 17/18 connections: 1 +process: "1" up/down Bps: 31/32 connections: 2 +process: "5" up/down Bps: 22/27 connections: 2 +connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 31/32 process: "1" +connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 22/27 process: "5" +remote_address: one.one.one.one up/down Bps: 31/32 connections: 2 +remote_address: three.three.three.three up/down Bps: 22/27 connections: 2 diff --git a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap index 411375d94..8389f58c7 100644 --- a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 49Bps / 51Bps :443 => 1.1.1.1:12345 (tcp) 1 49Bps / 51Bps + 1 1 24Bps / 25Bps :443 => 1.1.1.1:12345 (tcp) 1 24Bps / 25Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 49Bps / 51Bps + 1.1.1.1 1 24Bps / 25Bps diff --git a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap index d8e82591c..1ffe6585f 100644 --- a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - 5 1 0Bps / 45Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 2 1 0Bps / 42Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + 4 1 0Bps / 26Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 26Bps + 1 1 0Bps / 22Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps + 5 1 0Bps / 22Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 22Bps + 2 1 0Bps / 21Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap index 89a8a2c00..78414791f 100644 --- a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps - 5 1 0Bps / 45Bps - 1 1 0Bps / 44Bps - 2 1 0Bps / 42Bps + 4 1 0Bps / 26Bps + 1 1 0Bps / 22Bps + 5 1 0Bps / 22Bps + 2 1 0Bps / 21Bps @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps - :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 26Bps + :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps + :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 22Bps + :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_120_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_120_width_under_30_height-2.snap index 8cb384248..3bdeb73df 100644 --- a/src/tests/cases/snapshots/ui__layout_under_120_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_120_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps - 5 1 0Bps / 45Bps - 1 1 0Bps / 44Bps - 2 1 0Bps / 42Bps + 4 1 0Bps / 26Bps + 1 1 0Bps / 22Bps + 5 1 0Bps / 22Bps + 2 1 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap index 245c990ab..50ce0be50 100644 --- a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps - 5 1 0Bps / 45Bps - 1 1 0Bps / 44Bps - 2 1 0Bps / 42Bps + 4 1 0Bps / 26Bps + 1 1 0Bps / 22Bps + 5 1 0Bps / 22Bps + 2 1 0Bps / 21Bps @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :4434 => 2.2.2.2:54321 ( 0Bps / 53Bps 2.2.2.2 0Bps / 53Bps - :4435 => 3.3.3.3:1337 (t 0Bps / 45Bps 3.3.3.3 0Bps / 45Bps - :443 => 1.1.1.1:12345 (t 0Bps / 44Bps 1.1.1.1 0Bps / 44Bps - :4432 => 4.4.4.4:1337 (t 0Bps / 42Bps 4.4.4.4 0Bps / 42Bps + :4434 => 2.2.2.2:54321 ( 0Bps / 26Bps 2.2.2.2 0Bps / 26Bps + :443 => 1.1.1.1:12345 (t 0Bps / 22Bps 1.1.1.1 0Bps / 22Bps + :4435 => 3.3.3.3:1337 (t 0Bps / 22Bps 3.3.3.3 0Bps / 22Bps + :4432 => 4.4.4.4:1337 (t 0Bps / 21Bps 4.4.4.4 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap index 3bb6f5056..54b05f883 100644 --- a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 0Bps / 53Bps :4434 => 2.2.2.2:54321 ( 0Bps / 53Bps - 5 0Bps / 45Bps :4435 => 3.3.3.3:1337 (t 0Bps / 45Bps - 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (t 0Bps / 44Bps - 2 0Bps / 42Bps :4432 => 4.4.4.4:1337 (t 0Bps / 42Bps + 4 0Bps / 26Bps :4434 => 2.2.2.2:54321 ( 0Bps / 26Bps + 1 0Bps / 22Bps :443 => 1.1.1.1:12345 (t 0Bps / 22Bps + 5 0Bps / 22Bps :4435 => 3.3.3.3:1337 (t 0Bps / 22Bps + 2 0Bps / 21Bps :4432 => 4.4.4.4:1337 (t 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap index 392c31345..e8ec78f1e 100644 --- a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 2 0Bps / 95Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 51Bps - :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps + 1 2 0Bps / 47Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 25Bps + :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 2 0Bps / 95Bps + 1.1.1.1 2 0Bps / 47Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap index e2d5cd7d0..25cd79e21 100644 --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps / 44Bps :443 => 2.2.2.2:12345 (tcp) 1 0Bps / 44Bps - 4 1 0Bps / 39Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 39Bps + 1 1 0Bps / 22Bps :443 => 2.2.2.2:12345 (tcp) 1 0Bps / 22Bps + 4 1 0Bps / 19Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 19Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 2.2.2.2 2 0Bps / 83Bps + 2.2.2.2 2 0Bps / 41Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap index 124314b0c..29619a5ab 100644 --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps / 91Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 91Bps + 1 1 0Bps / 45Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 45Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 0Bps / 91Bps + 1.1.1.1 1 0Bps / 45Bps diff --git a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap index 3ff049f11..2f877f70e 100644 --- a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - 5 1 0Bps / 45Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 2 1 0Bps / 42Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + 4 1 0Bps / 26Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 26Bps + 1 1 0Bps / 22Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps + 5 1 0Bps / 22Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 22Bps + 2 1 0Bps / 21Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 21Bps @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - 2.2.2.2 1 0Bps / 53Bps - 3.3.3.3 1 0Bps / 45Bps - 1.1.1.1 1 0Bps / 44Bps - 4.4.4.4 1 0Bps / 42Bps + 2.2.2.2 1 0Bps / 26Bps + 1.1.1.1 1 0Bps / 22Bps + 3.3.3.3 1 0Bps / 22Bps + 4.4.4.4 1 0Bps / 21Bps diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap index 5f83849af..1e3df1c19 100644 --- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap @@ -2,12 +2,12 @@ source: src/tests/cases/ui.rs expression: "&terminal_draw_events_mirror[2]" --- - 69 82 + 160Bps / 180Bps - 5 32 46 5 => 3.3.3.3:1 37 5 32 46 - 1 7 6 => 1.1.1.1:12 45 1 7 6 + 2 31 2 31 2 + 2 22 27 22 27 @@ -30,13 +30,8 @@ expression: "&terminal_draw_events_mirror[2]" -<<<<<<< HEAD - 3 3 3 3 32 46 - 1 1 1 1 7 6 -======= - 3 3 3 3 33 4 - 1 1 1 1 47 48 ->>>>>>> Update UI snapshots for new bandwidth calculation + 2 31 2 + 2 22 27 diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode.snap b/src/tests/cases/snapshots/ui__no_resolve_mode.snap index 908ae2e00..06e95240b 100644 --- a/src/tests/cases/snapshots/ui__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps / 61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :4435 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps + 1 1 28Bps / 30Bps :443 => 1.1.1.1:12345 (tcp) 1 28Bps / 30Bps + 5 1 17Bps / 18Bps :4435 => 3.3.3.3:1337 (tcp) 5 17Bps / 18Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 57Bps / 61Bps - 3.3.3.3 1 34Bps / 37Bps + 1.1.1.1 1 28Bps / 30Bps + 3.3.3.3 1 17Bps / 18Bps diff --git a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap index 10c508f9d..0d4ee31f4 100644 --- a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 42Bps / 0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps / 0Bps + 1 1 21Bps / 0Bps :443 => 1.1.1.1:12345 (tcp) 1 21Bps / 0Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 42Bps / 0Bps + 1.1.1.1 1 21Bps / 0Bps diff --git a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap index 95bb60629..14c4cabe8 100644 --- a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 2 0Bps / 92Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 48Bps - :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps + 1 2 0Bps / 46Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 24Bps + :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 2 0Bps / 92Bps + 1.1.1.1 2 0Bps / 46Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap index d3974f035..862f41f4c 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes-2.snap @@ -2,12 +2,12 @@ source: src/tests/cases/ui.rs expression: "&terminal_draw_events_mirror[2]" --- - 112Bps + 195Bps - 61 61 - 51 51 + 2 35 35 + 2 30 30 @@ -30,13 +30,8 @@ expression: "&terminal_draw_events_mirror[2]" -<<<<<<< HEAD - 61 - 51 -======= - 52 - 45 ->>>>>>> Update UI snapshots for new bandwidth calculation + 2 35 + 2 30 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap index a7b7f3281..990f92029 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 5 1 0Bps / 39Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 39Bps + 1 1 0Bps / 22Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps + 5 1 0Bps / 19Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 19Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 0Bps / 44Bps - 3.3.3.3 1 0Bps / 39Bps + 1.1.1.1 1 0Bps / 22Bps + 3.3.3.3 1 0Bps / 19Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap index 5f83849af..1e3df1c19 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap @@ -2,12 +2,12 @@ source: src/tests/cases/ui.rs expression: "&terminal_draw_events_mirror[2]" --- - 69 82 + 160Bps / 180Bps - 5 32 46 5 => 3.3.3.3:1 37 5 32 46 - 1 7 6 => 1.1.1.1:12 45 1 7 6 + 2 31 2 31 2 + 2 22 27 22 27 @@ -30,13 +30,8 @@ expression: "&terminal_draw_events_mirror[2]" -<<<<<<< HEAD - 3 3 3 3 32 46 - 1 1 1 1 7 6 -======= - 3 3 3 3 33 4 - 1 1 1 1 47 48 ->>>>>>> Update UI snapshots for new bandwidth calculation + 2 31 2 + 2 22 27 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap index 908ae2e00..06e95240b 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps / 61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :4435 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps + 1 1 28Bps / 30Bps :443 => 1.1.1.1:12345 (tcp) 1 28Bps / 30Bps + 5 1 17Bps / 18Bps :4435 => 3.3.3.3:1337 (tcp) 5 17Bps / 18Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 57Bps / 61Bps - 3.3.3.3 1 34Bps / 37Bps + 1.1.1.1 1 28Bps / 30Bps + 3.3.3.3 1 17Bps / 18Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap index 5c61f1e41..a250affe9 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process-2.snap @@ -2,11 +2,11 @@ source: src/tests/cases/ui.rs expression: "&terminal_draw_events_mirror[2]" --- - 51 + 95 - 51 51 + 2 31 31 @@ -30,11 +30,7 @@ expression: "&terminal_draw_events_mirror[2]" -<<<<<<< HEAD - 51 -======= - 7 ->>>>>>> Update UI snapshots for new bandwidth calculation + 2 31 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap index 965284821..20d2d4cba 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps + 1 1 0Bps / 22Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 22Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 0Bps / 44Bps + 1.1.1.1 1 0Bps / 22Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap index bba3e700e..1e3df1c19 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap @@ -2,12 +2,12 @@ source: src/tests/cases/ui.rs expression: "&terminal_draw_events_mirror[2]" --- - 69 82 + 160Bps / 180Bps - 5 32 46 5 => three.thr e.three.three:1 5 32 46 - 1 7 6 => one.one.on .one:12345 (tcp 1 7 6 + 2 31 2 31 2 + 2 22 27 22 27 @@ -30,13 +30,8 @@ expression: "&terminal_draw_events_mirror[2]" -<<<<<<< HEAD - three.thre three.three 32 46 - one.one.on one 7 6 -======= - three.thre three.three 33 4 - one.one.on one 47 48 ->>>>>>> Update UI snapshots for new bandwidth calculation + 2 31 2 + 2 22 27 diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap index a35adada7..b0839ab32 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps / 61Bps :443 => one.one.one.one:12345 (tcp 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :4435 => three.three.three.three:1 5 34Bps / 37Bps + 1 1 28Bps / 30Bps :443 => one.one.one.one:12345 (tcp 1 28Bps / 30Bps + 5 1 17Bps / 18Bps :4435 => three.three.three.three:1 5 17Bps / 18Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - one.one.one.one 1 57Bps / 61Bps - three.three.three.three 1 34Bps / 37Bps + one.one.one.one 1 28Bps / 30Bps + three.three.three.three 1 17Bps / 18Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap index 2d94cdfb8..736801fc6 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[2]" - 1 1 42Bps / 0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps / 0Bps + 1 1 21Bps / 0Bps :443 => 1.1.1.1:12345 (tcp) 1 21Bps / 0Bps @@ -30,7 +30,7 @@ expression: "&terminal_draw_events_mirror[2]" - 1.1.1.1 1 42Bps / 0Bps + 1.1.1.1 1 21Bps / 0Bps