diff options
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | src/btop.cpp | 2 | ||||
-rw-r--r-- | src/linux/btop_collect.cpp | 10 |
4 files changed, 16 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e51591..c101021 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v1.0.14 (next release) +## v1.0.14 * Changed: Total system memory is checked at every update instead of once at start @@ -8,6 +8,8 @@ * Fixed: snap root disk and changed to compiler flags instead of env variables for detection +* Added: Development branch for OSX, by @joske + ## v1.0.13 * Changed: Graph empty symbol is now regular whitespace @@ -38,6 +38,11 @@ ### Under development +##### 6 October 2021 + +OsX development have been started by @joske , big thanks :) +See branch [OSX](https://github.com/aristocratos/btop/tree/OSX) for current progress. + ##### 18 September 2021 The Linux version of btop++ is complete. Released as version 1.0.0 diff --git a/src/btop.cpp b/src/btop.cpp index 2977eb8..2e0b01b 100644 --- a/src/btop.cpp +++ b/src/btop.cpp @@ -55,7 +55,7 @@ namespace Global { {"#801414", "██████╔╝ ██║ ╚██████╔╝██║ ╚═╝ ╚═╝"}, {"#000000", "╚═════╝ ╚═╝ ╚═════╝ ╚═╝"}, }; - const string Version = "1.0.13"; + const string Version = "1.0.14"; int coreCount; string overlay; diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index ff72654..9ba9bcc 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -112,7 +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."); } - + //? 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, {}); @@ -675,7 +675,7 @@ namespace Mem { } if (not meminfo.good() or totalMem == 0) throw std::runtime_error("Could not get total memory size from /proc/meminfo"); - + return totalMem; } @@ -896,7 +896,11 @@ namespace Mem { disks.at("swap").free_percent = mem.percent.at("swap_free").back(); } for (const auto& name : last_found) - if (not is_in(name, "/", "swap")) mem.disks_order.push_back(name); + #ifdef SNAPPED + if (not is_in(name, "/mnt", "swap")) mem.disks_order.push_back(name); + #else + if (not is_in(name, "/", "swap")) mem.disks_order.push_back(name); + #endif //? Get disks IO int64_t sectors_read, sectors_write, io_ticks; |