CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-20 19:30:23 +12:00
Code Issues Projects Releases Wiki Activity

Fixed: Account for system rolling over net speeds in Net::collect()

Browse source
This commit is contained in:
aristocratos 2021-12-30 11:26:23 +01:00
parent 2171789675
commit 56deec4988
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/btop_input.cpp
View file

@ -517,8 +517,8 @@ namespace Input {
ndev.stat.at("upload").offset = 0;
}
else {
ndev.stat.at("download").offset = ndev.stat.at("download").last;
ndev.stat.at("upload").offset = ndev.stat.at("upload").last;
ndev.stat.at("download").offset = ndev.stat.at("download").last + ndev.stat.at("download").rollover;
ndev.stat.at("upload").offset = ndev.stat.at("upload").last + ndev.stat.at("upload").rollover;
}
no_update = false;
}

2
src/btop_shared.hpp
View file

@ -171,7 +171,7 @@ namespace Net {
extern unordered_flat_map<string, uint64_t> graph_max;
struct net_stat {
uint64_t speed = 0, top = 0, total = 0, last = 0, offset = 0;
uint64_t speed = 0, top = 0, total = 0, last = 0, offset = 0, rollover = 0;
};
struct net_info {

12
src/linux/btop_collect.cpp
View file

@ -1103,10 +1103,18 @@ namespace Net {
catch (const std::out_of_range&) {}
//? Update speed, total and top values
if (val < saved_stat.last) {
saved_stat.rollover += saved_stat.last;
saved_stat.last = 0;
}
if (cmp_greater((unsigned long long)saved_stat.rollover + (unsigned long long)val, numeric_limits<uint64_t>::max())) {
saved_stat.rollover = 0;
saved_stat.last = 0;
}
saved_stat.speed = round((double)(val - saved_stat.last) / ((double)(new_timestamp - timestamp) / 1000));
if (saved_stat.speed > saved_stat.top) saved_stat.top = saved_stat.speed;
if (saved_stat.offset > val) saved_stat.offset = 0;
saved_stat.total = val - saved_stat.offset;
if (saved_stat.offset > val + saved_stat.rollover) saved_stat.offset = 0;
saved_stat.total = (val + saved_stat.rollover) - saved_stat.offset;
saved_stat.last = val;
//? Add values to graph

12
src/osx/btop_collect.cpp
View file

@ -927,10 +927,18 @@ namespace Net {
}
//? Update speed, total and top values
if (val < saved_stat.last) {
saved_stat.rollover += saved_stat.last;
saved_stat.last = 0;
}
if (cmp_greater((unsigned long long)saved_stat.rollover + (unsigned long long)val, numeric_limits<uint64_t>::max())) {
saved_stat.rollover = 0;
saved_stat.last = 0;
}
saved_stat.speed = round((double)(val - saved_stat.last) / ((double)(new_timestamp - timestamp) / 1000));
if (saved_stat.speed > saved_stat.top) saved_stat.top = saved_stat.speed;
if (saved_stat.offset > val) saved_stat.offset = 0;
saved_stat.total = val - saved_stat.offset;
if (saved_stat.offset > val + saved_stat.rollover) saved_stat.offset = 0;
saved_stat.total = (val + saved_stat.rollover) - saved_stat.offset;
saved_stat.last = val;
//? Add values to graph