CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-29 16:50:20 +12:00
Code Issues Projects Releases Wiki Activity

remove some warnings

Browse source
This commit is contained in:
Jos Dehaes 2021-10-06 14:45:44 +02:00
parent 775dff5f72
commit cf51ba2ebe
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/osx/btop_collect.cpp
View file

@ -262,12 +262,12 @@ namespace Cpu {
} }
string get_cpuHz() { string get_cpuHz() {
uint64_t freq = 0; int64_t freq = 1;
size_t size = sizeof(freq); size_t size = sizeof(freq);
return "1.0";
if (sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0) < 0) { if (sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0) < 0) {
Logger::error("Failed to get CPU frequency"); char *err = strerror(errno);
Logger::error("Failed to get CPU frequency: " + string(err));
} }
return std::to_string(freq); return std::to_string(freq);
} }
@ -489,7 +489,6 @@ namespace Mem {
auto &show_swap = Config::getB("show_swap"); auto &show_swap = Config::getB("show_swap");
auto &show_disks = Config::getB("show_disks"); auto &show_disks = Config::getB("show_disks");
auto &swap_disk = Config::getB("swap_disk"); auto &swap_disk = Config::getB("swap_disk");
auto totalMem = get_totalMem();
auto &mem = current_mem; auto &mem = current_mem;
static const bool snapped = (getenv("BTOP_SNAPPED") != NULL); static const bool snapped = (getenv("BTOP_SNAPPED") != NULL);
@ -532,7 +531,7 @@ namespace Mem {
double uptime = system_uptime(); double uptime = system_uptime();
auto &disks_filter = Config::getS("disks_filter"); auto &disks_filter = Config::getS("disks_filter");
bool filter_exclude = false; bool filter_exclude = false;
auto &only_physical = Config::getB("only_physical"); // auto &only_physical = Config::getB("only_physical");
auto &disks = mem.disks; auto &disks = mem.disks;
vector<string> filter; vector<string> filter;
if (not disks_filter.empty()) { if (not disks_filter.empty()) {
@ -1000,11 +999,9 @@ namespace Proc {
found.push_back(pid); found.push_back(pid);
//? Check if pid already exists in current_procs //? Check if pid already exists in current_procs
auto find_old = rng::find(current_procs, pid, &proc_info::pid); auto find_old = rng::find(current_procs, pid, &proc_info::pid);
bool no_cache = false;
if (find_old == current_procs.end()) { if (find_old == current_procs.end()) {
current_procs.push_back(p); current_procs.push_back(p);
find_old = current_procs.end() - 1; find_old = current_procs.end() - 1;
no_cache = true;
} }
//? Process cpu usage since last update //? Process cpu usage since last update
p.cpu_p = clamp(round(cmult * 1000 * (cpu_t - p.cpu_t) / max((uint64_t)1, cputimes - old_cputimes)) / 10.0, 0.0, 100.0 * Shared::coreCount); p.cpu_p = clamp(round(cmult * 1000 * (cpu_t - p.cpu_t) / max((uint64_t)1, cputimes - old_cputimes)) / 10.0, 0.0, 100.0 * Shared::coreCount);