zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

状态栏: 修复 CPU 使用率不能正确获取 bug

Browse Source
This commit is contained in:
Zedhugh Chen
2026-02-14 05:07:11 +08:00
parent 3edac120d2
commit 9baa3d4d1c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/status.c
View File

@@ -34,16 +34,16 @@ typedef struct cpu_stat_t {
uint64_t guest_nice; uint64_t guest_nice;
} cpu_stat_t; } cpu_stat_t;
static double calc_cpu_usage(cpu_stat_t curr, cpu_stat_t prev) { static double calc_cpu_usage(cpu_stat_t *curr, cpu_stat_t *prev) {
uint64_t curr_idle = curr.idle + curr.iowait; uint64_t curr_idle = curr->idle + curr->iowait;
uint64_t curr_total = curr.user + curr.nice + curr.system + curr.idle + uint64_t curr_total = curr->user + curr->nice + curr->system + curr->idle +
curr.iowait + curr.irq + curr.softirq + curr.steal + curr->iowait + curr->irq + curr->softirq + curr->steal +
curr.guest + curr.guest_nice; curr->guest + curr->guest_nice;
uint64_t prev_idle = prev.idle + prev.iowait; uint64_t prev_idle = prev->idle + prev->iowait;
uint64_t prev_total = prev.user + prev.nice + prev.system + prev.idle + uint64_t prev_total = prev->user + prev->nice + prev->system + prev->idle +
prev.iowait + prev.irq + prev.softirq + prev.steal + prev->iowait + prev->irq + prev->softirq + prev->steal +
prev.guest + prev.guest_nice; prev->guest + prev->guest_nice;
uint64_t total = curr_total - prev_total; uint64_t total = curr_total - prev_total;
uint64_t idle = curr_idle - prev_idle; uint64_t idle = curr_idle - prev_idle;
@@ -68,7 +68,7 @@ static bool get_cpu_usage(double *usage, GError *error) {
char cpu_line[256]; char cpu_line[256];
for (gchar **line = lines; *line != nullptr; ++line) { for (gchar **line = lines; *line != nullptr; ++line) {
if (strncmp(cpu_line, "cpu", 4) == 0) { if (strncmp(*line, "cpu ", 4) == 0) {
strncpy(cpu_line, *line, sizeof(cpu_line)); strncpy(cpu_line, *line, sizeof(cpu_line));
break; break;
} }
@@ -84,7 +84,7 @@ static bool get_cpu_usage(double *usage, GError *error) {
inited = true; inited = true;
} }
double percent = calc_cpu_usage(stat, prev_cpu_stat); double percent = calc_cpu_usage(&stat, &prev_cpu_stat);
prev_cpu_stat = stat; prev_cpu_stat = stat;
*usage = percent; *usage = percent;