mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-27 22:01:29 +02:00
Merge branch 'OSX' of github.com:aristocratos/btop into OSX
This commit is contained in:
commit
84d0596294
@ -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
|
* 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
|
* 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
|
## v1.0.13
|
||||||
|
|
||||||
* Changed: Graph empty symbol is now regular whitespace
|
* Changed: Graph empty symbol is now regular whitespace
|
||||||
|
@ -38,6 +38,11 @@
|
|||||||
|
|
||||||
### Under development
|
### 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
|
##### 18 September 2021
|
||||||
|
|
||||||
The Linux version of btop++ is complete. Released as version 1.0.0
|
The Linux version of btop++ is complete. Released as version 1.0.0
|
||||||
|
@ -55,7 +55,7 @@ namespace Global {
|
|||||||
{"#801414", "██████╔╝ ██║ ╚██████╔╝██║ ╚═╝ ╚═╝"},
|
{"#801414", "██████╔╝ ██║ ╚██████╔╝██║ ╚═╝ ╚═╝"},
|
||||||
{"#000000", "╚═════╝ ╚═╝ ╚═════╝ ╚═╝"},
|
{"#000000", "╚═════╝ ╚═╝ ╚═════╝ ╚═╝"},
|
||||||
};
|
};
|
||||||
const string Version = "1.0.13";
|
const string Version = "1.0.14";
|
||||||
|
|
||||||
int coreCount;
|
int coreCount;
|
||||||
string overlay;
|
string overlay;
|
||||||
|
@ -112,7 +112,7 @@ namespace Shared {
|
|||||||
clkTck = 100;
|
clkTck = 100;
|
||||||
Logger::warning("Could not get system clock ticks per second. Defaulting to 100, processes cpu usage might be incorrect.");
|
Logger::warning("Could not get system clock ticks per second. Defaulting to 100, processes cpu usage might be incorrect.");
|
||||||
}
|
}
|
||||||
|
|
||||||
//? Init for namespace Cpu
|
//? 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();
|
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, {});
|
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)
|
if (not meminfo.good() or totalMem == 0)
|
||||||
throw std::runtime_error("Could not get total memory size from /proc/meminfo");
|
throw std::runtime_error("Could not get total memory size from /proc/meminfo");
|
||||||
|
|
||||||
return totalMem;
|
return totalMem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -896,7 +896,11 @@ namespace Mem {
|
|||||||
disks.at("swap").free_percent = mem.percent.at("swap_free").back();
|
disks.at("swap").free_percent = mem.percent.at("swap_free").back();
|
||||||
}
|
}
|
||||||
for (const auto& name : last_found)
|
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
|
//? Get disks IO
|
||||||
int64_t sectors_read, sectors_write, io_ticks;
|
int64_t sectors_read, sectors_write, io_ticks;
|
||||||
|
Loading…
Reference in New Issue
Block a user