Split cpu module #2114
Split cpu module #2114
Conversation
|
Hey! |
|
@Alexays I deduplicated the code; I didn't move the shared code to own files though, the cpu module uses the functions of the cpu_frequency, cpu_usage and load module. Is that ok? If not, where should those shared files live? In utils? |
mmhat
force-pushed
the
split-cpu-module
branch
from
1ecd572
to
55ce342
Compare
|
There's some errors in freebsd tests, can you check? |
The module provides the three system load averages. This is an improvement compared what you can do with the cpu module: cpu only provides the one minute sample and the state of the cpu module is derived from the cpu usage which messes up the formating of the load average. Also, at least on modern Linux systems, the load of a system takes much more than the cpu utilization into account and it should therefore live in a separate module.
mmhat
force-pushed
the
split-cpu-module
branch
from
55ce342
to
93d66a9
Compare
|
@Alexays I fixed the freebsd code and the CI is green again. Can you approve the workflows? |
| static std::vector<float> frequencies; | ||
| if (frequencies.empty()) { | ||
| spdlog::warn( | ||
| "cpu/bsd: parseCpuFrequencies is not implemented, expect garbage in {*_frequency}"); |
There was a problem hiding this comment.
Chase module rename and maybe slightly deduplicate wording
| "cpu/bsd: parseCpuFrequencies is not implemented, expect garbage in {*_frequency}"); | |
| "cpu_frequency: not implemented on BSDs, expect garbage in {*_frequency}"); |
| @@ -99,6 +99,17 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { | |||
| if (ref == "cpu") { | |||
| return new waybar::modules::Cpu(id, config_[name]); | |||
| } | |||
| #if defined(HAVE_CPU_LINUX) | |||
There was a problem hiding this comment.
Maybe remove the conditional as the module code is still compiled in. cpu is like a superset, so cpu_frequency printing different warning is confusing:
$ waybar
[...]
-[2023-10-04 09:23:30.090] [warning] cpu_frequency: not implemented on BSDs, expect garbage in {*_frequency}
+[2023-10-04 10:05:32.888] [warning] module cpu_frequency: Unknown module: cpu_frequency
|
Sorry again for the delay, do you think it's possible to do another PR to update man and Github Wiki? |
|
Nice, thank you @Alexays ! Yes, I can do that. |
This PR contains three different modules that were derived from the original cpu module: cpu_frequency, cpu_usage and load.
The reasoning behind that split is that it is impossible to define states that severe all three purposes equally well, e.g. say I want a different color if the cpu usage goes above 50 percent and a different format if the load goes above 10.
As another improvement the load module now also shows the 5 minute and the 15 minute average.