cpu_freq: Simplify with E-notation

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 60a7991..14c8658 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,25 +1,30 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
+       #include <inttypes.h>
+       #include <stdint.h>
+
        const char *
        cpu_freq(void)
        {
-               int freq;
+               uintmax_t freq;
 
-               return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-                              "%d", &freq) == 1) ?
-                      bprintf("%d", (freq + 500) / 1000) : NULL;
+               /* in kHz */
+               if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
+                           "%" PRIuMAX, &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];
 
@@ -29,8 +34,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;
                }
 
@@ -41,6 +45,7 @@
                                (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]))));
        }
 #elif defined(__OpenBSD__)
+       #include <inttypes.h>
        #include <sys/param.h>
        #include <sys/sched.h>
        #include <sys/sysctl.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) {
                        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;
@@ -83,8 +89,7 @@
                        warn("sysctl 'KERN_CPTIME':");
                        return NULL;
                }
-               if (!valid) {
-                       valid = 1;
+               if (b[0] == 0) {
                        return NULL;
                }