Merge branch 'master' into master
commit
bf3efdb89c
|
@ -1,7 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <unistd.h>
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
#include <numeric>
|
||||
|
@ -20,7 +19,7 @@ class Cpu : public ALabel {
|
|||
auto update() -> void;
|
||||
|
||||
private:
|
||||
uint16_t getCpuLoad();
|
||||
double getCpuLoad();
|
||||
std::tuple<uint16_t, std::string> getCpuUsage();
|
||||
std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
|
||||
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue