tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-07-18 17:02:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

cpu module: Reuse getCpuUsage of cpu_usage module

Browse Source
This commit is contained in:
Mann mit Hut
2023-07-29 15:56:51 +02:00
parent c45f6681b3
commit d1602e383c
7 changed files with 13 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/cpu_usage/common.cpp
View File

@@ -19,7 +19,7 @@ waybar::modules::CpuUsage::CpuUsage(const std::string& id, const Json::Value& co
auto waybar::modules::CpuUsage::update() -> void {
// TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
auto [cpu_usage, tooltip] = getCpuUsage();
auto [cpu_usage, tooltip] = CpuUsage::getCpuUsage(prev_times_);
if (tooltipEnabled()) {
label_.set_tooltip_text(tooltip);
}
@@ -52,17 +52,17 @@ auto waybar::modules::CpuUsage::update() -> void {
ALabel::update();
}
std::tuple<std::vector<uint16_t>, std::string> waybar::modules::CpuUsage::getCpuUsage() {
if (prev_times_.empty()) {
prev_times_ = parseCpuinfo();
std::tuple<std::vector<uint16_t>, std::string> waybar::modules::CpuUsage::getCpuUsage(std::vector<std::tuple<size_t, size_t>>& prev_times) {
if (prev_times.empty()) {
prev_times = CpuUsage::parseCpuinfo();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
std::vector<std::tuple<size_t, size_t>> curr_times = parseCpuinfo();
std::vector<std::tuple<size_t, size_t>> curr_times = CpuUsage::parseCpuinfo();
std::string tooltip;
std::vector<uint16_t> usage;
for (size_t i = 0; i < curr_times.size(); ++i) {
auto [curr_idle, curr_total] = curr_times[i];
auto [prev_idle, prev_total] = prev_times_[i];
auto [prev_idle, prev_total] = prev_times[i];
const float delta_idle = curr_idle - prev_idle;
const float delta_total = curr_total - prev_total;
uint16_t tmp = 100 * (1 - delta_idle / delta_total);
@@ -73,6 +73,6 @@ std::tuple<std::vector<uint16_t>, std::string> waybar::modules::CpuUsage::getCpu
}
usage.push_back(tmp);
}
prev_times_ = curr_times;
prev_times = curr_times;
return {usage, tooltip};
}