i3status - Default to acpitz(4) instead of cpu(4) for OpenBSD temperature readings

[i3/i3status] / src / print_cpu_temperature.c

diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c
index 25b45f68489bcdef2088309dac50fd443aff67a7..b1d122187e616064525340f9d9186c0369c72140 100644 (file)
--- a/src/print_cpu_temperature.c
+++ b/src/print_cpu_temperature.c
@@ -16,6 +16,15 @@
 #define TZ_KELVTOC(x) (((x) - TZ_ZEROC) / 10), abs(((x) - TZ_ZEROC) % 10)
 #endif
 
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <errno.h>
+#include <err.h>
+#endif
+
 static char *thermal_zone;
 
 /*
@@ -29,10 +38,11 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
         char *outwalk = buffer;
         static char buf[16];
 
-        if (path == NULL) {
+        if (path == NULL)
                 asprintf(&thermal_zone, THERMAL_ZONE, zone);
-                path = thermal_zone;
-        }
+        else
+                asprintf(&thermal_zone, path, zone);
+        path = thermal_zone;
 
         INSTANCE(path);
 
@@ -59,14 +69,51 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
                                 goto error;
 
                         outwalk += sprintf(outwalk, "%d.%d", TZ_KELVTOC(sysctl_rslt));
+#elif defined(__OpenBSD__)
+       struct sensordev sensordev;
+       struct sensor sensor;
+       size_t sdlen, slen;
+       int dev, numt, mib[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
+
+       sdlen = sizeof(sensordev);
+       slen = sizeof(sensor);
+
+       for (dev = 0; ; dev++) {
+               mib[2] = dev;
+               if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
+                       if (errno == ENXIO)
+                               continue;
+                       if (errno == ENOENT)
+                               break;
+                       goto error;
+               }
+               /*
+                * 'path' is actually the node within the full path (currently always acpitz0).
+                * XXX: Extend the API to allow a string instead of just an int for path, this would
+                * allow us to build an arbitrary path.
+                */
+               if (strncmp(sensordev.xname, path, strlen(path)) == 0) {
+                       mib[3] = SENSOR_TEMP;
+                       for (numt = 0; numt < sensordev.maxnumt[SENSOR_TEMP]; numt++) {
+                               mib[4] = numt;
+                               if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
+                                       if (errno != ENOENT) {
+                                               warn("sysctl");
+                                               continue;
+                                       }
+                               }
+                               outwalk += sprintf(outwalk, "%.2f", (sensor.value - 273150000) / 1000000.0 );
+                       }
+               }
+       }
 #endif
                         walk += strlen("degrees");
                 }
         }
-
         OUTPUT_FULL_TEXT(buffer);
         return;
 error:
 #endif
-        (void)fputs("Cannot read temperature\n", stderr);
+        OUTPUT_FULL_TEXT("cant read temp");
+        (void)fputs("i3status: Cannot read temperature. Verify that you have a thermal zone in /sys/class/thermal or disable the cpu_temperature module in your i3status config.\n", stderr);
 }