b26b118d76
This patch fixes a bug in which multiple (conflicting) CPU temps may be included in the output for the "cpu temperature" module. The bug is due to the way that the code parsed the envsys(4)-returned data, and would manifest itself on x86-based NetBSD machines, since those use cputemp(4) as well as acpitz(4), thereby creating multiple envsys(4) entries with identical descriptions but which refer to different physical sensors. Instead of matching the description attribute of each device returned by envsys(4) against the target format, this patch throws away non-matching keys in the first instruction inside the dict walk. This has the benefit of sparing unnecessary CPU cycles, and preventing other sensors from being included erroneously. Additionally, the THERMAL_ZONE format is now joined with OpenBSD in that it uses acpitz(4) explicitly. This is prefered since it is much older (dating back to NetBSD 2.0), and does not exclude x86-based users (as with cputemp(4)).
195 lines
7.1 KiB
C
195 lines
7.1 KiB
C
#ifndef _I3STATUS_H
|
||
#define _I3STATUS_H
|
||
|
||
enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_TERM, O_NONE } output_format;
|
||
|
||
#include <stdbool.h>
|
||
#include <confuse.h>
|
||
#include <time.h>
|
||
#include <yajl/yajl_gen.h>
|
||
#include <yajl/yajl_version.h>
|
||
#include <unistd.h>
|
||
#include <string.h>
|
||
|
||
#define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0)
|
||
#define max(a, b) ((a) > (b) ? (a) : (b))
|
||
|
||
#if defined(LINUX)
|
||
|
||
#define THERMAL_ZONE "/sys/class/thermal/thermal_zone%d/temp"
|
||
|
||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
||
|
||
/* this needs the coretemp module to be loaded */
|
||
#if defined(__DragonFly__)
|
||
#define THERMAL_ZONE "hw.sensors.cpu%d.temp0"
|
||
#else
|
||
#define THERMAL_ZONE "dev.cpu.%d.temperature"
|
||
#endif
|
||
#define BATT_LIFE "hw.acpi.battery.life"
|
||
#define BATT_TIME "hw.acpi.battery.time"
|
||
#define BATT_STATE "hw.acpi.battery.state"
|
||
|
||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||
/* Default to acpitz(4) if no path is set. */
|
||
#define THERMAL_ZONE "acpitz%d"
|
||
#endif
|
||
|
||
#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
|
||
|
||
#include <sys/stat.h>
|
||
#include <sys/param.h>
|
||
|
||
#endif
|
||
|
||
/* Allows for the definition of a variable without opening a new scope, thus
|
||
* suited for usage in a macro. Idea from wmii. */
|
||
#define with(type, var, init) \
|
||
for (type var = (type)-1; (var == (type)-1) && ((var=(init)) || 1); )
|
||
|
||
#define CASE_SEC(name) \
|
||
if (BEGINS_WITH(current, name)) \
|
||
with(cfg_t *, sec, cfg_section = cfg_getsec(cfg, name)) \
|
||
if (sec != NULL)
|
||
|
||
#define CASE_SEC_TITLE(name) \
|
||
if (BEGINS_WITH(current, name)) \
|
||
with(const char *, title, current + strlen(name) + 1) \
|
||
with(cfg_t *, sec, cfg_section = cfg_gettsec(cfg, name, title)) \
|
||
if (sec != NULL)
|
||
|
||
/* Macro which any plugin can use to output the full_text part (when the output
|
||
* format is JSON) or just output to stdout (any other output format). */
|
||
#define OUTPUT_FULL_TEXT(text) \
|
||
do { \
|
||
/* Terminate the output buffer here in any case, so that it’s \
|
||
* not forgotten in the module */ \
|
||
*outwalk = '\0'; \
|
||
if (output_format == O_I3BAR) { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"full_text", strlen("full_text")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)text, strlen(text)); \
|
||
} else { \
|
||
printf("%s", text); \
|
||
} \
|
||
} while (0)
|
||
|
||
#define SEC_OPEN_MAP(name) \
|
||
do { \
|
||
if (output_format == O_I3BAR) { \
|
||
yajl_gen_map_open(json_gen); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"name", strlen("name")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)name, strlen(name)); \
|
||
} \
|
||
} while (0)
|
||
|
||
#define SEC_CLOSE_MAP \
|
||
do { \
|
||
if (output_format == O_I3BAR) { \
|
||
char *_align = cfg_getstr(sec, "align"); \
|
||
if (_align) { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"align", strlen("align")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)_align, strlen(_align)); \
|
||
} \
|
||
struct min_width *_width = cfg_getptr(sec, "min_width"); \
|
||
if (_width) { \
|
||
/* if the value can be parsed as a number, we use the numerical value */ \
|
||
if (_width->num > 0) { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"min_width", strlen("min_width")); \
|
||
yajl_gen_integer(json_gen, _width->num); \
|
||
} else { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"min_width", strlen("min_width")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)_width->str, strlen(_width->str)); \
|
||
} \
|
||
} \
|
||
const char *_sep = cfg_getstr(cfg_general, "separator"); \
|
||
if (strlen(_sep) == 0) {\
|
||
yajl_gen_string(json_gen, (const unsigned char *)"separator", strlen("separator")); \
|
||
yajl_gen_bool(json_gen, false); \
|
||
} \
|
||
yajl_gen_map_close(json_gen); \
|
||
} \
|
||
} while (0)
|
||
|
||
#define START_COLOR(colorstr) \
|
||
do { \
|
||
if (cfg_getbool(cfg_general, "colors")) { \
|
||
const char *_val = NULL; \
|
||
if (cfg_section) \
|
||
_val = cfg_getstr(cfg_section, colorstr); \
|
||
if (!_val) \
|
||
_val = cfg_getstr(cfg_general, colorstr); \
|
||
if (output_format == O_I3BAR) { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"color", strlen("color")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)_val, strlen(_val)); \
|
||
} else { \
|
||
outwalk += sprintf(outwalk, "%s", color(colorstr)); \
|
||
} \
|
||
} \
|
||
} while (0)
|
||
|
||
#define END_COLOR \
|
||
do { \
|
||
if (cfg_getbool(cfg_general, "colors") && output_format != O_I3BAR) { \
|
||
outwalk += sprintf(outwalk, "%s", endcolor()); \
|
||
} \
|
||
} while (0)
|
||
|
||
#define INSTANCE(instance) \
|
||
do { \
|
||
if (output_format == O_I3BAR) { \
|
||
yajl_gen_string(json_gen, (const unsigned char *)"instance", strlen("instance")); \
|
||
yajl_gen_string(json_gen, (const unsigned char *)instance, strlen(instance)); \
|
||
} \
|
||
} while (0)
|
||
|
||
|
||
typedef enum { CS_DISCHARGING, CS_CHARGING, CS_FULL } charging_status_t;
|
||
|
||
/*
|
||
* The "min_width" module option may either be defined as a string or a number.
|
||
*/
|
||
struct min_width {
|
||
long num;
|
||
const char *str;
|
||
};
|
||
|
||
/* src/general.c */
|
||
char *skip_character(char *input, char character, int amount);
|
||
void die(const char *fmt, ...);
|
||
bool slurp(const char *filename, char *destination, int size);
|
||
|
||
/* src/output.c */
|
||
void print_separator(const char *separator);
|
||
char *color(const char *colorstr);
|
||
char *endcolor() __attribute__ ((pure));
|
||
void reset_cursor(void);
|
||
|
||
/* src/auto_detect_format.c */
|
||
char *auto_detect_format();
|
||
|
||
/* src/print_time.c */
|
||
void set_timezone(const char *tz);
|
||
|
||
void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
|
||
void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *prefix_type, const char *threshold_type, const double low_threshold);
|
||
void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds);
|
||
void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t);
|
||
void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
|
||
const char *get_ip_addr();
|
||
void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
|
||
void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format);
|
||
void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, 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);
|
||
void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format);
|
||
void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
|
||
void print_load(yajl_gen json_gen, char *buffer, const char *format, const float max_threshold);
|
||
void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *fmt_muted, const char *device, const char *mixer, int mixer_idx);
|
||
bool process_runs(const char *path);
|
||
|
||
/* socket file descriptor for general purposes */
|
||
extern int general_socket;
|
||
|
||
extern cfg_t *cfg, *cfg_general, *cfg_section;
|
||
|
||
#endif
|