summaryrefslogtreecommitdiffstats
path: root/src/linux/btop_collect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/linux/btop_collect.cpp')
-rw-r--r--src/linux/btop_collect.cpp90
1 files changed, 64 insertions, 26 deletions
diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp
index 56730e7..ff72654 100644
--- a/src/linux/btop_collect.cpp
+++ b/src/linux/btop_collect.cpp
@@ -27,6 +27,10 @@ tab-size = 4
#include <ifaddrs.h>
#include <net/if.h>
+#ifndef STATIC_BUILD
+ #include <pwd.h>
+#endif
+
#include <btop_shared.hpp>
#include <btop_config.hpp>
#include <btop_tools.hpp>
@@ -78,9 +82,7 @@ namespace Mem {
namespace Shared {
fs::path procPath, passwd_path;
- uint64_t totalMem;
long pageSize, clkTck, coreCount;
- int totalMem_len;
void init() {
@@ -110,17 +112,7 @@ namespace Shared {
clkTck = 100;
Logger::warning("Could not get system clock ticks per second. Defaulting to 100, processes cpu usage might be incorrect.");
}
-
- ifstream meminfo(Shared::procPath / "meminfo");
- if (meminfo.good()) {
- meminfo.ignore(SSmax, ':');
- meminfo >> totalMem;
- totalMem_len = to_string(totalMem).size();
- totalMem <<= 10;
- }
- if (not meminfo.good() or totalMem == 0)
- throw std::runtime_error("Could not get total memory size from /proc/meminfo");
-
+
//? Init for namespace Cpu
if (not fs::exists(Cpu::freq_path) or access(Cpu::freq_path.c_str(), R_OK) == -1) Cpu::freq_path.clear();
Cpu::current_cpu.core_percent.insert(Cpu::current_cpu.core_percent.begin(), Shared::coreCount, {});
@@ -673,13 +665,27 @@ namespace Mem {
mem_info current_mem {};
+ uint64_t get_totalMem() {
+ ifstream meminfo(Shared::procPath / "meminfo");
+ int64_t totalMem;
+ if (meminfo.good()) {
+ meminfo.ignore(SSmax, ':');
+ meminfo >> totalMem;
+ totalMem <<= 10;
+ }
+ if (not meminfo.good() or totalMem == 0)
+ throw std::runtime_error("Could not get total memory size from /proc/meminfo");
+
+ return totalMem;
+ }
+
auto collect(const bool no_update) -> mem_info& {
if (Runner::stopping or (no_update and not current_mem.percent.at("used").empty())) return current_mem;
auto& show_swap = Config::getB("show_swap");
auto& swap_disk = Config::getB("swap_disk");
auto& show_disks = Config::getB("show_disks");
+ auto totalMem = get_totalMem();
auto& mem = current_mem;
- static const bool snapped = (getenv("BTOP_SNAPPED") != NULL);
mem.stats.at("swap_total") = 0;
@@ -714,7 +720,7 @@ namespace Mem {
meminfo.ignore(SSmax, '\n');
}
if (not got_avail) mem.stats.at("available") = mem.stats.at("free") + mem.stats.at("cached");
- mem.stats.at("used") = Shared::totalMem - mem.stats.at("available");
+ mem.stats.at("used") = totalMem - mem.stats.at("available");
if (mem.stats.at("swap_total") > 0) mem.stats.at("swap_used") = mem.stats.at("swap_total") - mem.stats.at("swap_free");
}
else
@@ -724,7 +730,7 @@ namespace Mem {
//? Calculate percentages
for (const auto& name : mem_names) {
- mem.percent.at(name).push_back(round((double)mem.stats.at(name) * 100 / Shared::totalMem));
+ mem.percent.at(name).push_back(round((double)mem.stats.at(name) * 100 / totalMem));
while (cmp_greater(mem.percent.at(name).size(), width * 2)) mem.percent.at(name).pop_front();
}
@@ -784,8 +790,12 @@ namespace Mem {
for (string instr; diskread >> instr;) {
if (not instr.starts_with('#')) {
diskread >> instr;
- if (snapped and instr == "/") fstab.push_back("/mnt");
- else if (not is_in(instr, "none", "swap")) fstab.push_back(instr);
+ #ifdef SNAPPED
+ if (instr == "/") fstab.push_back("/mnt");
+ else if (not is_in(instr, "none", "swap")) fstab.push_back(instr);
+ #else
+ if (not is_in(instr, "none", "swap")) fstab.push_back(instr);
+ #endif
}
diskread.ignore(SSmax, '\n');
}
@@ -822,7 +832,10 @@ namespace Mem {
if (not disks.contains(mountpoint)) {
disks[mountpoint] = disk_info{fs::canonical(dev, ec), fs::path(mountpoint).filename()};
if (disks.at(mountpoint).dev.empty()) disks.at(mountpoint).dev = dev;
- if (disks.at(mountpoint).name.empty()) disks.at(mountpoint).name = (mountpoint == "/" or (snapped and mountpoint == "/mnt") ? "root" : mountpoint);
+ #ifdef SNAPPED
+ if (mountpoint == "/mnt") disks.at(mountpoint).name = "root";
+ #endif
+ if (disks.at(mountpoint).name.empty()) disks.at(mountpoint).name = (mountpoint == "/" ? "root" : mountpoint);
string devname = disks.at(mountpoint).dev.filename();
while (devname.size() >= 2) {
if (fs::exists("/sys/block/" + devname + "/stat", ec) and access(string("/sys/block/" + devname + "/stat").c_str(), R_OK) == 0) {
@@ -868,8 +881,11 @@ namespace Mem {
//? Setup disks order in UI and add swap if enabled
mem.disks_order.clear();
- if (snapped and disks.contains("/mnt")) mem.disks_order.push_back("/mnt");
- else if (disks.contains("/")) mem.disks_order.push_back("/");
+ #ifdef SNAPPED
+ if (disks.contains("/mnt")) mem.disks_order.push_back("/mnt");
+ #else
+ if (disks.contains("/")) mem.disks_order.push_back("/");
+ #endif
if (swap_disk and has_swap) {
mem.disks_order.push_back("swap");
if (not disks.contains("swap")) disks["swap"] = {"", "swap"};
@@ -1259,7 +1275,7 @@ namespace Proc {
detailed.memory = floating_humanizer(detailed.entry.mem);
}
if (detailed.first_mem == -1 or detailed.first_mem < detailed.mem_bytes.back() / 2 or detailed.first_mem > detailed.mem_bytes.back() * 4) {
- detailed.first_mem = min((uint64_t)detailed.mem_bytes.back() * 2, Shared::totalMem);
+ detailed.first_mem = min((uint64_t)detailed.mem_bytes.back() * 2, Mem::get_totalMem());
redraw = true;
}
@@ -1324,6 +1340,9 @@ namespace Proc {
else {
should_filter = true;
+ auto totalMem = Mem::get_totalMem();
+ int totalMem_len = to_string(totalMem >> 10).size();
+
//? Update uid_user map if /etc/passwd changed since last run
if (not Shared::passwd_path.empty() and fs::last_write_time(Shared::passwd_path) != passwd_time) {
string r_uid, r_user;
@@ -1410,7 +1429,26 @@ namespace Proc {
}
}
pread.close();
- new_proc.user = (uid_user.contains(uid)) ? uid_user.at(uid) : uid;
+ if (uid_user.contains(uid)) {
+ new_proc.user = uid_user.at(uid);
+ }
+ else {
+ #ifndef STATIC_BUILD
+ try {
+ struct passwd* udet;
+ udet = getpwuid(stoi(uid));
+ if (udet != NULL and udet->pw_name != NULL) {
+ new_proc.user = string(udet->pw_name);
+ }
+ else {
+ new_proc.user = uid;
+ }
+ }
+ catch (...) { new_proc.user = uid; }
+ #else
+ new_proc.user = uid;
+ #endif
+ }
}
//? Parse /proc/[pid]/stat
@@ -1460,8 +1498,8 @@ namespace Proc {
next_x = 24;
continue;
case 24: //? RSS memory (can be inaccurate, but parsing smaps increases total cpu usage by ~20x)
- if (cmp_greater(short_str.size(), Shared::totalMem_len))
- new_proc.mem = Shared::totalMem;
+ if (cmp_greater(short_str.size(), totalMem_len))
+ new_proc.mem = totalMem;
else
new_proc.mem = stoull(short_str) * Shared::pageSize;
}
@@ -1477,7 +1515,7 @@ namespace Proc {
if (x-offset < 24) continue;
//? Get RSS memory from /proc/[pid]/statm if value from /proc/[pid]/stat looks wrong
- if (new_proc.mem >= Shared::totalMem) {
+ if (new_proc.mem >= totalMem) {
pread.open(d.path() / "statm");
if (not pread.good()) continue;
pread.ignore(SSmax, ' ');
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 20:58:53 +0000