print_cpu_usage: Fix warnings on non linux

[i3/i3status] / src / print_cpu_usage.c

diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c
index 71fc5b7b97ea02a8da441e600e86f35cae99b7b2..2c59f69277ffc0452f62f2498cda0c7c093efa22 100644 (file)
--- a/src/print_cpu_usage.c
+++ b/src/print_cpu_usage.c
@@ -1,75 +1,111 @@
-// vim:sw=8:sts=8:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
 #include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/dkstat.h>
 #endif
 
+#if defined(__DragonFly__)
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/resource.h>
+#endif
+
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/sched.h>
+#endif
+
 #include "i3status.h"
 
 static int prev_total = 0;
-static int prev_idle  = 0;
+static int prev_idle = 0;
 
 /*
  * Reads the CPU utilization from /proc/stat and returns the usage as a
  * percentage.
  *
  */
-void print_cpu_usage(const char *format) {
-        const char *walk;
-        char buf[1024];
-        int curr_user, curr_nice, curr_system, curr_idle, curr_total;
-        int diff_idle, diff_total, diff_usage;
+void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format) {
+    const char *walk;
+    char *outwalk = buffer;
+    int curr_user = 0, curr_nice = 0, curr_system = 0, curr_idle = 0, curr_total;
+    int diff_idle, diff_total, diff_usage;
 
 #if defined(LINUX)
-        static char statpath[512];
-        strcpy(statpath, "/proc/stat");
-        if (!slurp(statpath, buf, sizeof(buf)))
-                die("could not read %s\n", statpath);
+    static char statpath[512];
+    char buf[1024];
+    strcpy(statpath, "/proc/stat");
+    if (!slurp(statpath, buf, sizeof(buf)) ||
+        sscanf(buf, "cpu %d %d %d %d", &curr_user, &curr_nice, &curr_system, &curr_idle) != 4)
+        goto error;
+
+    curr_total = curr_user + curr_nice + curr_system + curr_idle;
+    diff_idle = curr_idle - prev_idle;
+    diff_total = curr_total - prev_total;
+    diff_usage = (diff_total ? (1000 * (diff_total - diff_idle) / diff_total + 5) / 10 : 0);
+    prev_total = curr_total;
+    prev_idle = curr_idle;
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+    size_t size;
+    long cp_time[CPUSTATES];
+    size = sizeof cp_time;
+    if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0)
+        goto error;
+#else
+    /* This information is taken from the boot cpu, any other cpus are currently ignored. */
+    long cp_time[CPUSTATES];
+    int mib[2];
+    size_t size = sizeof(cp_time);
 
-        if (sscanf(buf, "cpu %d %d %d %d", &curr_user, &curr_nice, &curr_system, &curr_idle) != 4)
-                die("could not read cpu utilization\n");
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_CPTIME;
 
-        curr_total = curr_user + curr_nice + curr_system + curr_idle;
-        diff_idle  = curr_idle - prev_idle;
-        diff_total = curr_total - prev_total;
-        diff_usage = (1000 * (diff_total - diff_idle)/diff_total + 5)/10;
-        prev_total = curr_total;
-        prev_idle  = curr_idle;
+    if (sysctl(mib, 2, cp_time, &size, NULL, 0))
+        goto error;
 #endif
-#if defined(__FreeBSD__)
-        size_t size;
-        long cp_time[CPUSTATES];
-        size = sizeof cp_time;
-        if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0){
-                return;
-        }
-        curr_user = cp_time[CP_USER];
-        curr_nice = cp_time[CP_NICE];
-        curr_system = cp_time[CP_SYS];
-        curr_idle = cp_time[CP_IDLE];
-        curr_total = curr_user + curr_nice + curr_system + curr_idle;
-        diff_idle  = curr_idle - prev_idle;
-        diff_total = curr_total - prev_total;
-        diff_usage = (1000 * (diff_total - diff_idle)/diff_total + 5)/10;
-        prev_total = curr_total;
-        prev_idle  = curr_idle;
 
+    curr_user = cp_time[CP_USER];
+    curr_nice = cp_time[CP_NICE];
+    curr_system = cp_time[CP_SYS];
+    curr_idle = cp_time[CP_IDLE];
+    curr_total = curr_user + curr_nice + curr_system + curr_idle;
+    diff_idle = curr_idle - prev_idle;
+    diff_total = curr_total - prev_total;
+    diff_usage = (diff_total ? (1000 * (diff_total - diff_idle) / diff_total + 5) / 10 : 0);
+    prev_total = curr_total;
+    prev_idle = curr_idle;
+#else
+    goto error;
 #endif
-        for (walk = format; *walk != '\0'; walk++) {
-                if (*walk != '%') {
-                        putchar(*walk);
-                        continue;
-                }
+    for (walk = format; *walk != '\0'; walk++) {
+        if (*walk != '%') {
+            *(outwalk++) = *walk;
+            continue;
+        }
 
-                if (strncmp(walk+1, "usage", strlen("usage")) == 0) {
-                        printf("%02d%%", diff_usage);
-                        walk += strlen("usage");
-                }
+        if (BEGINS_WITH(walk + 1, "usage")) {
+            outwalk += sprintf(outwalk, "%02d%%", diff_usage);
+            walk += strlen("usage");
         }
+    }
+
+    OUTPUT_FULL_TEXT(buffer);
+    return;
+error:
+    OUTPUT_FULL_TEXT("cant read cpu usage");
+    (void)fputs("i3status: Cannot read CPU usage\n", stderr);
 }