#include "i3status.h"
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <err.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/sensors.h>
#include <errno.h>
#include <err.h>
+
+#define MUKTOC(v) ((v - 273150000) / 1000000.0)
#endif
static char *thermal_zone;
* returns the temperature in degree celcius.
*
*/
-void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format) {
+void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int max_threshold) {
#ifdef THERMAL_ZONE
const char *walk;
char *outwalk = buffer;
- static char buf[16];
+ bool colorful_output;
- 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);
if (BEGINS_WITH(walk+1, "degrees")) {
#if defined(LINUX)
+ static char buf[16];
long int temp;
if (!slurp(path, buf, sizeof(buf)))
goto error;
temp = strtol(buf, NULL, 10);
if (temp == LONG_MIN || temp == LONG_MAX || temp <= 0)
*(outwalk++) = '?';
- else
+ else {
+ if ((temp/1000) >= max_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
+ }
outwalk += sprintf(outwalk, "%ld", (temp/1000));
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if (colorful_output)
+ END_COLOR;
+ }
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
int sysctl_rslt;
size_t sysctl_size = sizeof(sysctl_rslt);
if (sysctlbyname(path, &sysctl_rslt, &sysctl_size, NULL, 0))
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.
- */
+ /* 'path' is the node within the full path (defaults to acpitz0). */
if (strncmp(sensordev.xname, path, strlen(path)) == 0) {
mib[3] = SENSOR_TEMP;
- for (numt = 0; numt < sensordev.maxnumt[SENSOR_TEMP]; numt++) {
+ /* Limit to temo0, but should retrieve from a full path... */
+ for (numt = 0; numt < 1 /*sensordev.maxnumt[SENSOR_TEMP]*/; numt++) {
mib[4] = numt;
if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
- if (errno != ENOENT)
+ if (errno != ENOENT) {
warn("sysctl");
- continue;
+ continue;
+ }
+ }
+ if ((int)MUKTOC(sensor.value) >= max_threshold) {
+ START_COLOR("color_bad");
+ colorful_output = true;
}
- outwalk += sprintf(outwalk, "%.2f", (sensor.value - 273150000) / 1000000.0 );
+
+ outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value));
+
+ if (colorful_output)
+ END_COLOR;
}
}
}
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);
}