From a49b12b66b4ff2d8de12ead98caf822d9eb35308 Mon Sep 17 00:00:00 2001 From: Antonin Reitz Date: Fri, 12 Mar 2021 20:58:51 +0100 Subject: [PATCH] Fix CPU load values --- include/modules/cpu.hpp | 3 +-- src/modules/cpu/common.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 7a703364..d5b79e05 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include #include @@ -20,7 +19,7 @@ class Cpu : public ALabel { auto update() -> void; private: - uint16_t getCpuLoad(); + double getCpuLoad(); std::tuple getCpuUsage(); std::vector> parseCpuinfo(); diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index e86d10a0..03befe42 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -32,10 +32,10 @@ auto waybar::modules::Cpu::update() -> void { ALabel::update(); } -uint16_t waybar::modules::Cpu::getCpuLoad() { +double waybar::modules::Cpu::getCpuLoad() { double load[1]; if (getloadavg(load, 1) != -1) { - return load[0] * 100 / sysconf(_SC_NPROCESSORS_ONLN); + return load[0]; } throw std::runtime_error("Can't get Cpu load"); }