Fix temperature reporting on OpenBSD

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index d4f8064..9e28003 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -24,7 +24,7 @@
        cpu_perc(void)
        {
                static long double a[7];
-               long double b[7];
+               long double b[7], sum;
 
                memcpy(b, a, sizeof(b));
                /* cpu user nice system idle iowait irq softirq */
@@ -37,13 +37,16 @@
                        return NULL;
                }
 
+               sum = (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]);
+
+               if (sum == 0) {
+                       return NULL;
+               }
+
                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]))));
+                               (a[0] + a[1] + a[2] + a[5] + a[6])) / sum));
        }
 #elif defined(__OpenBSD__)
        #include <sys/param.h>
@@ -53,8 +56,7 @@
        const char *
        cpu_freq(void)
        {
-               int mib[2];
-               uintmax_t freq;
+               int freq, mib[2];
                size_t size;
 
                mib[0] = CTL_HW;
@@ -76,7 +78,7 @@
        {
                int mib[2];
                static uintmax_t a[CPUSTATES];
-               uintmax_t b[CPUSTATES];
+               uintmax_t b[CPUSTATES], sum;
                size_t size;
 
                mib[0] = CTL_KERN;
@@ -93,14 +95,70 @@
                        return NULL;
                }
 
+               sum = (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]);
+
+               if (sum == 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])) /
+                                b[CP_INTR])) / sum);
+       }
+#elif defined(__FreeBSD__)
+       #include <sys/param.h>
+       #include <sys/sysctl.h>
+       #include <devstat.h>
+
+       const char *
+       cpu_freq(void)
+       {
+               int freq;
+               size_t size;
+
+               size = sizeof(freq);
+               /* in MHz */
+               if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) == -1
+                               || !size) {
+                       warn("sysctlbyname 'hw.clockrate':");
+                       return NULL;
+               }
+
+               return fmt_human(freq * 1E6, 1000);
+       }
+
+       const char *
+       cpu_perc(void)
+       {
+               size_t size;
+               static long a[CPUSTATES];
+               long b[CPUSTATES], sum;
+
+               size = sizeof(a);
+               memcpy(b, a, sizeof(b));
+               if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) == -1
+                               || !size) {
+                       warn("sysctlbyname 'kern.cp_time':");
+                       return NULL;
+               }
+               if (b[0] == 0) {
+                       return NULL;
+               }
+
+               sum = (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]);
+
+               if (sum == 0) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 *
                               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
-                                a[CP_INTR] + a[CP_IDLE]) -
+                                a[CP_INTR]) -
                                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] +
-                                b[CP_INTR] + b[CP_IDLE])));
+                                b[CP_INTR])) / sum);
        }
 #endif