diff options
| author | Kelvin Zhang <zhangxp1998@gmail.com> | 2020-01-05 17:40:47 -0500 |
|---|---|---|
| committer | Kelvin Zhang <zhangxp1998@gmail.com> | 2020-01-09 20:02:16 -0500 |
| commit | 36d25e7b57a7617211cac729dfbc0424d4fa3578 (patch) | |
| tree | df69f3684ff4f1be58ce315224a784c21ecc16ee | |
| parent | 2c7dd50ad8ce46960c4db9e9f7030a510c647355 (diff) | |
Update UI snapshots for new bandwidth calculation
6 files changed, 43 insertions, 28 deletions
diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs index 290f972..a5bdfcb 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 857fa24..5f83849 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 a7e7af8..d3974f0 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 857fa24..5f83849 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 7ea883c..5c61f1e 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 712bc0b..bba3e70 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 |