fix(ui-state): do not overcalculate bandwidth and connections #114
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhangxp1998
requested changes
Jan 13, 2020
src/display/ui_state.rs
Outdated
| 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_previously_seen = seen_connections.contains(connection); |
There was a problem hiding this comment.
This can be replaced with
let connection_previously_seen = !seen_connections.insert(connection);
And the insert statement at the bottom can be removed.
There was a problem hiding this comment.
Ah, right! Thanks for this :)
ebroto
requested changes
Jan 13, 2020
There was a problem hiding this comment.
LGTM! Just marking as "needs work" to take into account @zhangxp1998 suggestion
ebroto
requested changes
Jan 14, 2020
ebroto
approved these changes
Jan 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So, yesterday I broke master with this: #77
What that PR essentially does is save a cache of the last 5 states and then display their average bandwidth.
I forgot to take the total bandwidth into account, so until this PR master shows ~5 times as much total bandwidth as there actually is.
I also forgot to take the connection count into account, and so in master the connections were counted once for every state.
The total bandwidth calculation was a fairly straightforward fix: just divide it by the amount of cached states like we do with the rest of the bandwidth.
With the connection count, dividing would not do since we don't want a connection average of the past N seconds, but an exact count (of the past N seconds). I did this here by only counting a connection the first time we see it.
So, umm... oops. :)