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

RAII

Browse source
This commit is contained in:
Jos Dehaes 2021-11-27 20:30:43 +01:00
parent 7c433be4a6
commit 860a9fe472
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/freebsd/btop_collect.cpp
View file

@ -496,6 +496,15 @@ namespace Mem {
while (cmp_greater(disk.io_activity.size(), width * 2)) disk.io_activity.pop_front();
}
class PipeWrapper {
public:
PipeWrapper(const char *file, const char *mode) {fd = popen(file, mode);}
virtual ~PipeWrapper() {std::fclose(fd);}
auto operator()() -> FILE* { return fd;};
private:
FILE *fd;
};
void collect_disk(unordered_flat_map<string, disk_info> &disks, unordered_flat_map<string, string> &mapping) {
// this bit is for 'regular' mounts
static struct statinfo cur, last;
@ -526,14 +535,14 @@ namespace Mem {
}
// this code is for ZFS mounts
FILE *f = popen("sysctl kstat.zfs.zroot.dataset", "r");
if (f) {
PipeWrapper f = PipeWrapper("sysctl kstat.zfs.zroot.dataset", "r");
if (f()) {
size_t len = 512;
char buf[512];
while (not std::feof(f)) {
while (not std::feof(f())) {
uint64_t nread, nwritten;
string datasetname; // this is the zfs volume, like 'zroot/usr/home' -> this maps onto the device we get back from getmntinfo(3)
if (fgets(buf, len, f)) {
if (fgets(buf, len, f())) {
char *name = std::strtok(buf, ": \n");
char *value = std::strtok(NULL, ": \n");
if (string(name).find("dataset_name") != string::npos) {
@ -556,7 +565,6 @@ namespace Mem {
}
}
}
std::fclose(f);
}
}