CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-11 15:04:39 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into macos-clang

Browse source
This commit is contained in:
Jakob P. Liljenberg 2023-12-12 23:05:52 +01:00 committed by GitHub
parent 0246b1b971 a017056ea0
commit 730af5d4e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/linux/btop_collect.cpp
View file

@ -1755,7 +1755,7 @@ namespace Mem {
//? Get disk/partition stats //? Get disk/partition stats
for (auto it = disks.begin(); it != disks.end(); ) { for (auto it = disks.begin(); it != disks.end(); ) {
auto &[mountpoint, disk] = *it; auto &[mountpoint, disk] = *it;
if (v_contains(ignore_list, mountpoint)) { if (v_contains(ignore_list, mountpoint) or disk.name == "swap") {
it = disks.erase(it); it = disks.erase(it);
continue; continue;
} }
@ -1936,29 +1936,32 @@ namespace Mem {
} }
// looking through all files that start with 'objset' to find the one containing `device_name` object stats // looking through all files that start with 'objset' to find the one containing `device_name` object stats
for (const auto& file: fs::directory_iterator(zfs_pool_stat_path)) { try {
filename = file.path().filename(); for (const auto& file: fs::directory_iterator(zfs_pool_stat_path)) {
if (filename.starts_with("objset")) { filename = file.path().filename();
filestream.open(file.path()); if (filename.starts_with("objset")) {
if (filestream.good()) { filestream.open(file.path());
// skip first two lines if (filestream.good()) {
for (int i = 0; i < 2; i++) filestream.ignore(numeric_limits<streamsize>::max(), '\n'); // skip first two lines
// skip characters until '7' is reached, indicating data type 7, next value will be object name for (int i = 0; i < 2; i++) filestream.ignore(numeric_limits<streamsize>::max(), '\n');
filestream.ignore(numeric_limits<streamsize>::max(), '7'); // skip characters until '7' is reached, indicating data type 7, next value will be object name
filestream >> name_compare; filestream.ignore(numeric_limits<streamsize>::max(), '7');
if (name_compare == device_name) { filestream >> name_compare;
filestream.close(); if (name_compare == device_name) {
if (access(file.path().c_str(), R_OK) == 0) { filestream.close();
return file.path(); if (access(file.path().c_str(), R_OK) == 0) {
} else { return file.path();
Logger::debug("Can't access file: " + file.path().string()); } else {
return ""; Logger::debug("Can't access file: " + file.path().string());
return "";
}
} }
} }
filestream.close();
} }
filestream.close();
} }
} }
catch (fs::filesystem_error& e) {}
Logger::debug("Could not read directory: " + zfs_pool_stat_path.string()); Logger::debug("Could not read directory: " + zfs_pool_stat_path.string());
return ""; return "";