Implement scaling for cpu_freq

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index b9b3924..2e910d9 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -6,14 +6,21 @@
 #include "../util.h"
 
 #if defined(__linux__)
+       #include <inttypes.h>
+       #include <stdint.h>
+
        const char *
        cpu_freq(void)
        {
-               int freq;
+               uint64_t freq;
+
+               /* in kHz */
+               if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
+                           "%"SCNu64, &freq) != 1) {
+                       return NULL;
+               }
 
-               return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-                              "%i", &freq) == 1) ?
-                      bprintf("%d", (freq + 500) / 1000) : NULL;
+               return fmt_human_10(freq * 1000, "Hz");
        }
 
        const char *
@@ -34,7 +41,7 @@
                        return NULL;
                }
 
-               return bprintf("%d", (int)(100 *
+               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]) -
@@ -56,12 +63,13 @@
 
                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_10((size_t)freq * 1000 * 1000, "Hz");
        }
 
        const char *
@@ -88,7 +96,7 @@
                        return NULL;
                }
 
-               return bprintf("%d", 100 *
+               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] +