mirror of
https://github.com/aristocratos/btop.git
synced 2024-06-02 10:35:14 +12:00
Use kvm and ifaddr defs from shared.hpp.
This commit is contained in:
parent
b472dce409
commit
b76d5e3f55
|
@ -34,7 +34,7 @@ tab-size = 4
|
||||||
#include <ifaddrs.h>
|
#include <ifaddrs.h>
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
# include <kvm.h>
|
# include <kvm.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ namespace Shared {
|
||||||
|
|
||||||
extern long coreCount, page_size, clk_tck;
|
extern long coreCount, page_size, clk_tck;
|
||||||
|
|
||||||
#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
struct KvmDeleter {
|
struct KvmDeleter {
|
||||||
void operator()(kvm_t* handle) {
|
void operator()(kvm_t* handle) {
|
||||||
kvm_close(handle);
|
kvm_close(handle);
|
||||||
|
|
|
@ -183,18 +183,6 @@ namespace Shared {
|
||||||
Mem::old_uptime = system_uptime();
|
Mem::old_uptime = system_uptime();
|
||||||
Mem::collect();
|
Mem::collect();
|
||||||
}
|
}
|
||||||
|
|
||||||
//* 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 Shared
|
||||||
|
|
||||||
namespace Cpu {
|
namespace Cpu {
|
||||||
|
@ -922,17 +910,6 @@ namespace Net {
|
||||||
bool rescale = true;
|
bool rescale = true;
|
||||||
uint64_t timestamp = 0;
|
uint64_t timestamp = 0;
|
||||||
|
|
||||||
//* RAII wrapper for getifaddrs
|
|
||||||
class getifaddr_wrapper {
|
|
||||||
struct ifaddrs *ifaddr;
|
|
||||||
|
|
||||||
public:
|
|
||||||
int status;
|
|
||||||
getifaddr_wrapper() { status = getifaddrs(&ifaddr); }
|
|
||||||
~getifaddr_wrapper() { freeifaddrs(ifaddr); }
|
|
||||||
auto operator()() -> struct ifaddrs * { return ifaddr; }
|
|
||||||
};
|
|
||||||
|
|
||||||
auto collect(bool no_update) -> net_info & {
|
auto collect(bool no_update) -> net_info & {
|
||||||
auto &net = current_net;
|
auto &net = current_net;
|
||||||
auto &config_iface = Config::getS("net_iface");
|
auto &config_iface = Config::getS("net_iface");
|
||||||
|
@ -942,10 +919,10 @@ namespace Net {
|
||||||
|
|
||||||
if (not no_update and errors < 3) {
|
if (not no_update and errors < 3) {
|
||||||
//? Get interface list using getifaddrs() wrapper
|
//? Get interface list using getifaddrs() wrapper
|
||||||
getifaddr_wrapper if_wrap{};
|
IfAddrsPtr if_addrs {};
|
||||||
if (if_wrap.status != 0) {
|
if (if_addrs.get_status() != 0) {
|
||||||
errors++;
|
errors++;
|
||||||
Logger::error("Net::collect() -> getifaddrs() failed with id " + to_string(if_wrap.status));
|
Logger::error("Net::collect() -> getifaddrs() failed with id " + to_string(if_addrs.get_status()));
|
||||||
redraw = true;
|
redraw = true;
|
||||||
return empty_net;
|
return empty_net;
|
||||||
}
|
}
|
||||||
|
@ -957,7 +934,7 @@ namespace Net {
|
||||||
string ipv4, ipv6;
|
string ipv4, ipv6;
|
||||||
|
|
||||||
//? Iteration over all items in getifaddrs() list
|
//? Iteration over all items in getifaddrs() list
|
||||||
for (auto *ifa = if_wrap(); ifa != nullptr; ifa = ifa->ifa_next) {
|
for (auto *ifa = if_addrs.get(); ifa != nullptr; ifa = ifa->ifa_next) {
|
||||||
if (ifa->ifa_addr == nullptr) continue;
|
if (ifa->ifa_addr == nullptr) continue;
|
||||||
family = ifa->ifa_addr->sa_family;
|
family = ifa->ifa_addr->sa_family;
|
||||||
const auto &iface = ifa->ifa_name;
|
const auto &iface = ifa->ifa_name;
|
||||||
|
@ -1244,8 +1221,8 @@ namespace Proc {
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
char buf[_POSIX2_LINE_MAX];
|
char buf[_POSIX2_LINE_MAX];
|
||||||
Shared::kvm_openfiles_wrapper kd(nullptr, nullptr, nullptr, KVM_NO_FILES, buf);
|
Shared::KvmPtr kd {kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, buf)};
|
||||||
const struct kinfo_proc2* kprocs = kvm_getproc2(kd(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &count);
|
const struct kinfo_proc2* kprocs = kvm_getproc2(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &count);
|
||||||
|
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
const struct kinfo_proc2* kproc = &kprocs[i];
|
const struct kinfo_proc2* kproc = &kprocs[i];
|
||||||
|
@ -1272,7 +1249,7 @@ namespace Proc {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
new_proc.name = kproc->p_comm;
|
new_proc.name = kproc->p_comm;
|
||||||
char** argv = kvm_getargv2(kd(), kproc, 0);
|
char** argv = kvm_getargv2(kd.get(), kproc, 0);
|
||||||
if (argv) {
|
if (argv) {
|
||||||
for (int i = 0; argv[i] and cmp_less(new_proc.cmd.size(), 1000); i++) {
|
for (int i = 0; argv[i] and cmp_less(new_proc.cmd.size(), 1000); i++) {
|
||||||
new_proc.cmd += argv[i] + " "s;
|
new_proc.cmd += argv[i] + " "s;
|
||||||
|
|
Loading…
Reference in a new issue