diff options
| author | Aaron Marcher <me@drkhsh.at> | 2018-07-08 17:42:58 +0200 |
|---|---|---|
| committer | Aaron Marcher <me@drkhsh.at> | 2018-07-08 17:42:58 +0200 |
| commit | 96ddf4e1dee808d6ae8162fc1a13126a3d4c77dc (patch) | |
| tree | 75f6d95fc7bbe3464c5f47574ab36a7514d0382e /components/cpu.c | |
| parent | c93971748cb4771aec25aee6e8ff5b7bbb1aacf3 (diff) | |
Consistency with 80 char limit and breaks
Diffstat (limited to 'components/cpu.c')
| -rw-r--r-- | components/cpu.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/components/cpu.c b/components/cpu.c index 43ee8a9..d4f8064 100644 --- a/components/cpu.c +++ b/components/cpu.c @@ -12,8 +12,8 @@ uintmax_t freq; /* in kHz */ - if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", - "%ju", &freq) != 1) { + if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/" + "scaling_cur_freq", "%ju", &freq) != 1) { return NULL; } @@ -29,7 +29,8 @@ memcpy(b, a, sizeof(b)); /* cpu user nice system idle iowait irq softirq */ if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", - &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) != 7) { + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) + != 7) { return NULL; } if (b[0] == 0) { @@ -39,8 +40,10 @@ return bprintf("%d", (int)(100 * ((b[0] + b[1] + b[2] + b[5] + b[6]) - (a[0] + a[1] + a[2] + a[5] + a[6])) / - ((b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) - - (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6])))); + ((b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + + b[6]) - + (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + + a[6])))); } #elif defined(__OpenBSD__) #include <sys/param.h> @@ -91,11 +94,13 @@ } return bprintf("%d", 100 * - ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) - - (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR])) / - ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + - a[CP_IDLE]) - - (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + - b[CP_IDLE]))); + ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + + a[CP_INTR]) - + (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + + b[CP_INTR])) / + ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + + a[CP_INTR] + a[CP_IDLE]) - + (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + + b[CP_INTR] + b[CP_IDLE]))); } #endif |