diff options
| author | Steffen Winter <steffen.winter@proton.me> | 2024-02-09 12:42:54 +0100 |
|---|---|---|
| committer | Steffen Winter <steffen.winter@proton.me> | 2024-02-09 13:16:09 +0100 |
| commit | ee46dba838da69e066232af79fe373a8533a7bc2 (patch) | |
| tree | d85a1a52b354e4cc9a3cbf5e972601312c48d6e0 /src/freebsd | |
| parent | edcb68cbb91c71de6c890f9392756f1ca15955d4 (diff) | |
bsd: Wrap kvm_t* in a uniq_ptr and share code between BSD's
Diffstat (limited to 'src/freebsd')
| -rw-r--r-- | src/freebsd/btop_collect.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/freebsd/btop_collect.cpp b/src/freebsd/btop_collect.cpp index 2db49a2..094d78a 100644 --- a/src/freebsd/btop_collect.cpp +++ b/src/freebsd/btop_collect.cpp @@ -189,18 +189,6 @@ namespace Shared { Logger::debug("Init -> Mem::get_zpools()"); Mem::get_zpools(); } - - //* RAII wrapper for kvm_openfiles - class kvm_openfiles_wrapper { - kvm_t* kd = nullptr; - public: - kvm_openfiles_wrapper(const char* execf, const char* coref, const char* swapf, int flags, char* err) { - this->kd = kvm_openfiles(execf, coref, swapf, flags, err); - } - ~kvm_openfiles_wrapper() { kvm_close(kd); } - auto operator()() -> kvm_t* { return kd; } - }; - } // namespace Shared namespace Cpu { @@ -668,9 +656,9 @@ namespace Mem { if (show_swap) { char buf[_POSIX2_LINE_MAX]; - Shared::kvm_openfiles_wrapper kd(nullptr, _PATH_DEVNULL, nullptr, O_RDONLY, buf); + Shared::KvmPtr kd {kvm_openfiles(nullptr, _PATH_DEVNULL, nullptr, O_RDONLY, buf)}; struct kvm_swap swap[16]; - int nswap = kvm_getswapinfo(kd(), swap, 16, 0); + int nswap = kvm_getswapinfo(kd.get(), swap, 16, 0); int totalSwap = 0, usedSwap = 0; for (int i = 0; i < nswap; i++) { totalSwap += swap[i].ksw_total; @@ -1164,8 +1152,8 @@ namespace Proc { int count = 0; char buf[_POSIX2_LINE_MAX]; - Shared::kvm_openfiles_wrapper kd(nullptr, _PATH_DEVNULL, nullptr, O_RDONLY, buf); - const struct kinfo_proc* kprocs = kvm_getprocs(kd(), KERN_PROC_PROC, 0, &count); + Shared::KvmPtr kd {kvm_openfiles(nullptr, _PATH_DEVNULL, nullptr, O_RDONLY, buf)}; + const struct kinfo_proc* kprocs = kvm_getprocs(kd.get(), KERN_PROC_PROC, 0, &count); for (int i = 0; i < count; i++) { const struct kinfo_proc* kproc = &kprocs[i]; @@ -1192,7 +1180,7 @@ namespace Proc { continue; } new_proc.name = kproc->ki_comm; - char** argv = kvm_getargv(kd(), kproc, 0); + char** argv = kvm_getargv(kd.get(), kproc, 0); if (argv) { for (int i = 0; argv[i] and cmp_less(new_proc.cmd.size(), 1000); i++) { new_proc.cmd += argv[i] + " "s; |