mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-30 07:01:35 +02:00
some comment + minor cleanup
This commit is contained in:
parent
a61df3ff98
commit
70d9777908
@ -479,12 +479,12 @@ namespace Mem {
|
|||||||
string name;
|
string name;
|
||||||
};
|
};
|
||||||
|
|
||||||
void collect_disk(unordered_flat_map<string, disk_info> &disks, unordered_flat_map<string, string> &mapping) {
|
void collect_disk(unordered_flat_map<string, disk_info> &disks) {
|
||||||
FILE *f = popen("sysctl kstat.zfs.zroot.dataset", "r");
|
FILE *f = popen("sysctl kstat.zfs.zroot.dataset", "r");
|
||||||
unordered_flat_map<string, dataset> datasets;
|
unordered_flat_map<string, dataset> datasets;
|
||||||
if (f) {
|
if (f) {
|
||||||
size_t len = 512;
|
size_t len = 512;
|
||||||
char buf[len];
|
char buf[512];
|
||||||
while (not std::feof(f)) {
|
while (not std::feof(f)) {
|
||||||
uint64_t nread, nwritten;
|
uint64_t nread, nwritten;
|
||||||
string datasetname;
|
string datasetname;
|
||||||
@ -494,7 +494,7 @@ namespace Mem {
|
|||||||
if (string(name).find("dataset_name") != string::npos) {
|
if (string(name).find("dataset_name") != string::npos) {
|
||||||
datasetname = string(value);
|
datasetname = string(value);
|
||||||
dataset d{nread, nwritten, datasetname};
|
dataset d{nread, nwritten, datasetname};
|
||||||
datasets[datasetname] = d;
|
datasets[datasetname] = d; //relies on the fact that the dataset name is last value in the list -- alternatively you could parse the objset-0x... when this changes, you have a new entry
|
||||||
Logger::debug("created " + d.name + "(" + std::to_string(d.nread) + "," + std::to_string(d.nwritten) + ")");
|
Logger::debug("created " + d.name + "(" + std::to_string(d.nread) + "," + std::to_string(d.nwritten) + ")");
|
||||||
} else if (string(name).find("nread") != string::npos) {
|
} else if (string(name).find("nread") != string::npos) {
|
||||||
nread = atoll(value);
|
nread = atoll(value);
|
||||||
@ -697,7 +697,7 @@ namespace Mem {
|
|||||||
mem.disks_order.push_back(name);
|
mem.disks_order.push_back(name);
|
||||||
|
|
||||||
disk_ios = 0;
|
disk_ios = 0;
|
||||||
collect_disk(disks, mapping);
|
collect_disk(disks);
|
||||||
|
|
||||||
old_uptime = uptime;
|
old_uptime = uptime;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user