Fix CPU frequency on OpenBSD

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index e7f4cd9..d9bd018 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <errno.h>
+#include <stdint.h>

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -9,84 +9,147 @@
        const char *
        cpu_freq(void)
        {
        const char *
        cpu_freq(void)
        {

-               int freq;
+               uintmax_t freq;
+
+               /* in kHz */
+               if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/"
+                          "scaling_cur_freq", "%ju", &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(freq * 1000, 1000);

        }
 
        const char *
        cpu_perc(void)
        {
        }
 
        const char *
        cpu_perc(void)
        {

-               int perc;

                static long double a[7];
                static long double a[7];

-               static int valid;

                long double b[7];
 
                memcpy(b, a, sizeof(b));
                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",
                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;
                }
                        return NULL;
                }

-               if (!valid) {
-                       valid = 1;
+               if (b[0] == 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               perc = 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>
+       #include <sys/sched.h>
+       #include <sys/sysctl.h>
+
+       const char *
+       cpu_freq(void)
+       {
+               int freq, mib[2];
+               size_t size;
+
+               mib[0] = CTL_HW;
+               mib[1] = HW_CPUSPEED;
+
+               size = sizeof(freq);
+
+               /* in MHz */
+               if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
+                       warn("sysctl 'HW_CPUSPEED':");
+                       return NULL;
+               }

 
 

-               return bprintf("%d", perc);
+               return fmt_human(freq * 1E6, 1000);

        }
 
        const char *
        }
 
        const char *

-       cpu_iowait(void)
+       cpu_perc(void)

        {
        {

-               int perc;
-               static int valid;
-               static long double a[7];
-               long double b[7];
+               int mib[2];
+               static uintmax_t a[CPUSTATES];
+               uintmax_t b[CPUSTATES];
+               size_t size;
+
+               mib[0] = CTL_KERN;
+               mib[1] = KERN_CPTIME;
+
+               size = sizeof(a);

 
                memcpy(b, a, sizeof(b));
 
                memcpy(b, a, sizeof(b));

-               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) {
+               if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
+                       warn("sysctl 'KERN_CPTIME':");

                        return NULL;
                }
                        return NULL;
                }

-               if (!valid) {
-                       valid = 1;
+               if (b[0] == 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               perc = 100 * ((b[4]) - (a[4])) /
-                      ((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", perc);
+               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])));

        }
        }

-#elif defined(__OpenBSD__)
+#elif defined(__FreeBSD__)
+       #include <sys/param.h>

        #include <sys/sysctl.h>
        #include <sys/sysctl.h>

+       #include <devstat.h>

 
        const char *
        cpu_freq(void)
        {
 
        const char *
        cpu_freq(void)
        {

-               int freq, mib[2];
+               int freq;

                size_t size;
 
                size_t size;
 

-               mib[0] = CTL_HW;
-               mib[1] = HW_CPUSPEED;
-

                size = sizeof(freq);
                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);
+       }

 
 

-               if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
-                       fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n",
-                               strerror(errno));
+       const char *
+       cpu_perc(void)
+       {
+               size_t size;
+               static long a[CPUSTATES];
+               long b[CPUSTATES];
+
+               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;
                }
 
                        return NULL;
                }
 

-               return bprintf("%d", freq);
+               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])));

        }
 #endif
        }
 #endif