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

use Shared::procPath, fix Logger error type

Browse source
This commit is contained in:
simplepad 2022-06-29 14:42:27 +03:00
parent 126e89bf17
commit aeea53518b
No known key found for this signature in database
GPG key ID: 00DB76DD9FB623EC
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/linux/btop_collect.cpp
View file

@ -947,8 +947,8 @@ namespace Mem {
disks.at(mountpoint).stat = "/sys/block/" + devname + "/stat";
break;
//? Set ZFS stat filepath
} else if (fs::exists("/proc/spl/kstat/zfs/" + devname + "/io", ec) and access(string("/proc/spl/kstat/zfs/" + devname + "/io").c_str(), R_OK) == 0) {
disks.at(mountpoint).stat = "/proc/spl/kstat/zfs/" + devname + "/io";
} else if (fs::exists(Shared::procPath.string() + "/spl/kstat/zfs/" + devname + "/io", ec) and access(string(Shared::procPath.string() + "/spl/kstat/zfs/" + devname + "/io").c_str(), R_OK) == 0) {
disks.at(mountpoint).stat = Shared::procPath.string() + "/spl/kstat/zfs/" + devname + "/io";
break;
}
devname.resize(devname.size() - 1);
@ -1079,7 +1079,7 @@ namespace Mem {
while (cmp_greater(disk.io_activity.size(), width * 2)) disk.io_activity.pop_front();
}
} else {
Logger::warning("Error in Mem::collect() : when opening " + (string)disk.stat);
Logger::debug("Error in Mem::collect() : when opening " + (string)disk.stat);
}
diskread.close();
}