Implement basic fetching of cpu temperature on OpenBSD.

diff --git a/include/i3status.h b/include/i3status.h
index ad54a144c6bd8809fc31728a9476df1b3f4fcd24..a6d5fc6ce4eecec9f68dab948ae191da0166ee2e 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -26,6 +26,15 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
 #define BATT_TIME "hw.acpi.battery.time"
 #define BATT_STATE "hw.acpi.battery.state"
 
+#elif defined(__OpenBSD__)
+/*
+ * Due to the fact there are various ways to obtain a temperature reading, THERMAL_ZONE will need
+ * to be adjustable enough for those situations. As it can either be hw.sensors.cpu%d.temp0, or
+ * hw.sensors.acpitz%d.temp0 or even something different entirely within hw.sensors.%s.temp0.
+ * XXX: For now just check cpu%d.temp0. Adjust this later.
+ */
+#define THERMAL_ZONE "cpu%d"
+
 #endif
 
 #if defined(__FreeBSD_kernel__) && defined(__GLIBC__)

diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c
index 25b45f68489bcdef2088309dac50fd443aff67a7..41c3c9c6097ff04e7d09044737a3d01a0ca47265 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;
 
 /*
@@ -59,11 +68,46 @@ 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 (eg, cpu0).
+                * XXX: Extend the API to allow a string instead of just an int for path, this would
+                * allow us to have a path of 'acpitz0' for example.
+                */
+               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: