ram: Consistency with line breaks

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 6551f31..d4f8064 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -9,36 +9,41 @@
        const char *
        cpu_freq(void)
        {
-               int freq;
+               uintmax_t freq;
 
-               return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-                              "%i", &freq) == 1) ?
-                      bprintf("%d", (freq + 500) / 1000) : NULL;
+               /* in kHz */
+               if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/"
+                          "scaling_cur_freq", "%ju", &freq) != 1) {
+                       return NULL;
+               }
+
+               return fmt_human(freq * 1000, 1000);
        }
 
        const char *
        cpu_perc(void)
        {
-               static int valid;
                static long double a[7];
                long double b[7];
 
                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 (!valid) {
-                       valid = 1;
+               if (b[0] == 0) {
                        return NULL;
                }
 
-               return bprintf("%d", 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])));
+               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]))));
        }
 #elif defined(__OpenBSD__)
        #include <sys/param.h>
@@ -48,7 +53,8 @@
        const char *
        cpu_freq(void)
        {
-               int freq, mib[2];
+               int mib[2];
+               uintmax_t freq;
                size_t size;
 
                mib[0] = CTL_HW;
@@ -56,21 +62,21 @@
 
                size = sizeof(freq);
 
+               /* in MHz */
                if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
-                       fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+                       warn("sysctl 'HW_CPUSPEED':");
                        return NULL;
                }
 
-               return bprintf("%d", freq);
+               return fmt_human(freq * 1E6, 1000);
        }
 
        const char *
        cpu_perc(void)
        {
                int mib[2];
-               static int valid;
-               static long int a[CPUSTATES];
-               long int b[CPUSTATES];
+               static uintmax_t a[CPUSTATES];
+               uintmax_t b[CPUSTATES];
                size_t size;
 
                mib[0] = CTL_KERN;
@@ -80,20 +86,21 @@
 
                memcpy(b, a, sizeof(b));
                if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
-                       fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
+                       warn("sysctl 'KERN_CPTIME':");
                        return NULL;
                }
-               if (!valid) {
-                       valid = 1;
+               if (b[0] == 0) {
                        return NULL;
                }
 
                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