CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-16 02:13:46 +12:00
Code Issues Projects Releases Wiki Activity

correctly iterate over devstat. still no idea how to map the devices we get back here to mountpoints

Browse source
This commit is contained in:
Jos Dehaes 2021-11-16 21:53:33 +01:00
parent e64610a163
commit a6602ff22b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/freebsd/btop_collect.cpp
View file

@ -478,12 +478,15 @@ namespace Mem {
static std::unique_ptr<struct devinfo, decltype(std::free)*> lastDevInfo (reinterpret_cast<struct devinfo*>(std::calloc(1, sizeof(struct devinfo))), std::free);
cur.dinfo = curDevInfo.get();
last.dinfo = lastDevInfo.get();
int n = devstat_getdevs(NULL, &cur);
for (int i = 0; i < n; i++) {
devstat_compute_statistics(&cur.dinfo->devices[i], NULL, etime, DSM_TOTAL_BYTES_READ, &total_bytes_read,
DSM_TOTAL_BYTES_WRITE, &total_bytes_write, DSM_NONE);
Logger::debug("dev " + string(cur.dinfo->devices[i].device_name) + " read=" + std::to_string(total_bytes_read) + " write=" + std::to_string(total_bytes_write));
}
if (devstat_getdevs(NULL, &cur) != -1) {
for (int i = 0; i < cur.dinfo->numdevs; i++) {
devstat_compute_statistics(&cur.dinfo->devices[i], NULL, etime, DSM_TOTAL_BYTES_READ, &total_bytes_read,
DSM_TOTAL_BYTES_WRITE, &total_bytes_write, DSM_NONE);
Logger::debug("dev " + string(cur.dinfo->devices[i].device_name) + std::to_string(cur.dinfo->devices[i].device_number) + " read=" + std::to_string(total_bytes_read) + " write=" + std::to_string(total_bytes_write));
}
Logger::debug("");
}
}
auto collect(const bool no_update) -> mem_info & {
@ -565,7 +568,6 @@ namespace Mem {
std::error_code ec;
string mountpoint = stfs[i].f_mntonname;
string dev = stfs[i].f_mntfromname;
Logger::debug(dev + "->" + mountpoint);
mapping[dev] = mountpoint;
if (string(stfs[i].f_fstypename) == "autofs") {