X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x5%2Fkhatus.c;h=bb76507ef0394918ad9718ece16a0f81512febb8;hb=7911aa98ea23b71ca4249621bcf861d9f6ca34f4;hp=26e491af34ca5d8ccc8d044d5936e182eb2fb39f;hpb=7fb02106fc146cdfad92fe5bafad2336c9b166c1;p=khatus.git diff --git a/x5/khatus.c b/x5/khatus.c index 26e491a..bb76507 100644 --- a/x5/khatus.c +++ b/x5/khatus.c @@ -8,13 +8,17 @@ #include #include #include +#include #include #include -#define debug(args...) {fprintf(stderr, "[debug] " args);} -#define info( args...) {fprintf(stderr, "[info] " args);} -#define error(args...) {fprintf(stderr, "[error] " args);} +#include "bsdtimespec.h" + +#define debug(args...) if (cfg->log_level >= Debug) {fprintf(stderr, "[debug] " args); fflush(stderr);} +#define info( args...) if (cfg->log_level >= Info ) {fprintf(stderr, "[info] " args); fflush(stderr);} +#define warn( args...) if (cfg->log_level >= Warn ) {fprintf(stderr, "[warn] " args); fflush(stderr);} +#define error(args...) if (cfg->log_level >= Error) {fprintf(stderr, "[error] " args); fflush(stderr);} #define fatal(args...) {fprintf(stderr, "[fatal] " args); exit(EXIT_FAILURE);} #define usage(args...) {print_usage(); fatal("[usage] " args);} @@ -25,6 +29,14 @@ static const int errlen = sizeof(ERRMSG) - 1; char *argv0; +typedef enum LogLevel { + Nothing, + Error, + Warn, + Info, + Debug +} LogLevel; + /* TODO: Convert fifo list to fifo array. */ typedef struct Fifo Fifo; struct Fifo { @@ -45,6 +57,7 @@ struct Config { int fifo_count; int total_width; int output_to_x_root_window; + LogLevel log_level; } defaults = { .interval = 1, .separator = "|", @@ -52,58 +65,60 @@ struct Config { .fifo_count = 0, .total_width = 0, .output_to_x_root_window = 0, + .log_level = Info, }; void -fifo_print_one(Fifo *f) +fifo_print_one(Fifo *f, Config *cfg) { - debug( - "Fifo " - "{" - " name = %s," - " fd = %d," - " width = %d," - " last_read = %d," - " ttl = %d," - " pos = %d," - " next = %p," - " }\n", - f->name, - f->fd, - f->width, - f->last_read, - f->ttl, - f->pos, - f->next + info("Fifo " + "{" + " name = %s," + " fd = %d," + " width = %d," + " last_read = %d," + " ttl = %d," + " pos = %d," + " next = %p," + " }\n", + f->name, + f->fd, + f->width, + f->last_read, + f->ttl, + f->pos, + f->next ); } void -fifo_print_all(Fifo *head) +fifo_print_all(Fifo *head, Config *cfg) { for (Fifo *f = head; f; f = f->next) { - fifo_print_one(f); + fifo_print_one(f, cfg); } } void -config_print(Config *c) +config_print(Config *cfg) { - debug( - "Config " - "{" - " interval = %d," - " separator = %s," - " fifo_count = %d," - " total_width = %d," - " fifos = ..." - " }\n", - c->interval, - c->separator, - c->fifo_count, - c->total_width + info( + "Config " + "{" + " interval = %d," + " separator = %s," + " fifo_count = %d," + " total_width = %d," + " log_level = %d," + " fifos = ..." + " }\n", + cfg->interval, + cfg->separator, + cfg->fifo_count, + cfg->total_width, + cfg->log_level ); - fifo_print_all(c->fifos); + fifo_print_all(cfg->fifos, cfg); } int @@ -120,26 +135,31 @@ print_usage() { assert(argv0); fprintf( - stderr, - "\n" - "Usage: %s [OPTION ...] SPEC [SPEC ...]\n" - "\n" - " SPEC = FILE_PATH DATA_WIDTH DATA_TTL\n" - " FILE_PATH = string\n" - " DATA_WIDTH = int (* (positive) number of characters *)\n" - " DATA_TTL = int (* (positive) number of seconds *)\n" - " OPTION = -i INTERVAL\n" - " | -s SEPARATOR\n" - " SEPARATOR = string\n" - " INTERVAL = int (* (positive) number of seconds *)\n" - "\n", - argv0 + stderr, + "\n" + "Usage: %s [OPTION ...] SPEC [SPEC ...]\n" + "\n" + " SPEC = FILE_PATH DATA_WIDTH DATA_TTL\n" + " FILE_PATH = string\n" + " DATA_WIDTH = int (* (positive) number of characters *)\n" + " DATA_TTL = int (* (positive) number of seconds *)\n" + " OPTION = -i INTERVAL\n" + " | -s SEPARATOR\n" + " | -x (* Output to X root window *)\n" + " | -l LOG_LEVEL\n" + " SEPARATOR = string\n" + " INTERVAL = int (* (positive) number of seconds *)\n" + " LOG_LEVEL = int (* %d through %d *)\n" + "\n", + argv0, + Nothing, + Debug ); fprintf( - stderr, - "Example: %s -i 1 /dev/shm/khatus/khatus_sensor_x 4 10\n" - "\n", - argv0 + stderr, + "Example: %s -i 1 /dev/shm/khatus/khatus_sensor_x 4 10\n" + "\n", + argv0 ); } @@ -148,44 +168,67 @@ void opts_parse_any(Config *, int, char *[], int); /* For mutually-recursive ca void parse_opts_opt_i(Config *cfg, int argc, char *argv[], int i) { - if (i < argc) { - char *param = argv[i++]; + char *param; - if (is_pos_num(param)) { - cfg->interval = atoi(param); - opts_parse_any(cfg, argc, argv, i); - } else { - usage("Option -i parameter is invalid: \"%s\"\n", param); - } - } else { + if (i >= argc) usage("Option -i parameter is missing.\n"); - } + param = argv[i++]; + if (!is_pos_num(param)) + usage("Option -i parameter is invalid: \"%s\"\n", param); + cfg->interval = atoi(param); + opts_parse_any(cfg, argc, argv, i); } void parse_opts_opt_s(Config *cfg, int argc, char *argv[], int i) { - if (i < argc) { - cfg->separator = calloc((strlen(argv[i]) + 1), sizeof(char)); - strcpy(cfg->separator, argv[i]); - opts_parse_any(cfg, argc, argv, ++i); - } else { + if (i >= argc) usage("Option -s parameter is missing.\n"); - } + cfg->separator = calloc((strlen(argv[i]) + 1), sizeof(char)); + strcpy(cfg->separator, argv[i]); + opts_parse_any(cfg, argc, argv, ++i); +} + +void +parse_opts_opt_l(Config *cfg, int argc, char *argv[], int i) +{ + char *param; + int log_level; + + if (i >= argc) + usage("Option -l parameter is missing.\n"); + param = argv[i++]; + if (!is_pos_num(param)) + usage("Option -l parameter is invalid: \"%s\"\n", param); + log_level = atoi(param); + if (log_level > Debug) + usage("Option -l value (%d) exceeds maximum (%d)\n", log_level, Debug); + cfg->log_level = log_level; + opts_parse_any(cfg, argc, argv, i); } void parse_opts_opt(Config *cfg, int argc, char *argv[], int i) { switch (argv[i][1]) { - case 'i': parse_opts_opt_i(cfg, argc, argv, ++i); break; /* TODO: Generic set_int */ - case 's': parse_opts_opt_s(cfg, argc, argv, ++i); break; /* TODO: Generic set_str */ - case 'x': { - cfg->output_to_x_root_window = 1; - opts_parse_any(cfg, argc, argv, ++i); - break; - } - default : usage("Option \"%s\" is invalid\n", argv[i]); + case 'i': + /* TODO: Generic set_int */ + parse_opts_opt_i(cfg, argc, argv, ++i); + break; + case 's': + /* TODO: Generic set_str */ + parse_opts_opt_s(cfg, argc, argv, ++i); + break; + case 'x': + cfg->output_to_x_root_window = 1; + opts_parse_any(cfg, argc, argv, ++i); + break; + case 'l': + /* TODO: Generic set_int */ + parse_opts_opt_l(cfg, argc, argv, ++i); + break; + default : + usage("Option \"%s\" is invalid\n", argv[i]); } } @@ -227,8 +270,11 @@ opts_parse_any(Config *cfg, int argc, char *argv[], int i) { if (i < argc) { switch (argv[i][0]) { - case '-': parse_opts_opt(cfg, argc, argv, i); break; - default : parse_opts_spec(cfg, argc, argv, i); + case '-': + parse_opts_opt(cfg, argc, argv, i); + break; + default : + parse_opts_spec(cfg, argc, argv, i); } } } @@ -265,7 +311,7 @@ fifo_read_error(Fifo *f, char *buf) } void -fifo_read_one(Fifo *f, char *buf) +fifo_read_one(Fifo *f, char *buf, Config *cfg) { ssize_t current; ssize_t total; @@ -281,9 +327,10 @@ fifo_read_one(Fifo *f, char *buf) if (current == -1) { error("Failed to read: \"%s\". Error: %s\n", f->name, strerror(errno)); fifo_read_error(f, buf); - } else + } else { while (total++ < f->width) *b++ = ' '; + } /* TODO Record timestamp read */ close(f->fd); f->fd = -1; @@ -298,7 +345,6 @@ fifo_read_all(Config *cfg, char *buf) struct stat st; FD_ZERO(&fds); - /* TODO: Check TTL */ for (Fifo *f = cfg->fifos; f; f = f->next) { /* TODO: Create the FIFO if it doesn't already exist. */ if (lstat(f->name, &st) < 0) { @@ -333,7 +379,30 @@ fifo_read_all(Config *cfg, char *buf) for (Fifo *f = cfg->fifos; f; f = f->next) { if (FD_ISSET(f->fd, &fds)) { debug("reading: %s\n", f->name); - fifo_read_one(f, buf); + fifo_read_one(f, buf, cfg); + } + } +} + +void +snooze(struct timespec *t, Config *cfg) +{ + struct timespec remainder; + int result; + + result = nanosleep(t, &remainder); + + if (result < 0) { + if (errno == EINTR) { + warn( + "nanosleep interrupted. Remainder: " + "{ tv_sec = %ld, tv_nsec = %ld }", + remainder.tv_sec, remainder.tv_nsec); + /* No big deal if we occasionally sleep less, + * so not attempting to correct after an interruption. + */ + } else { + fatal("nanosleep: %s\n", strerror(errno)); } } } @@ -351,12 +420,23 @@ main(int argc, char *argv[]) Config *cfg = &cfg0; Display *display = NULL; struct stat st; + struct timespec + t0, /* time stamp. before reading fifos */ + t1, /* time stamp. after reading fifos */ + ti, /* time interval desired (t1 - t0) */ + td, /* time interval measured (t1 - t0) */ + tc; /* time interval correction (ti - td) when td < ti */ argv0 = argv[0]; opts_parse(cfg, argc, argv); debug("argv0 = %s\n", argv0); config_print(cfg); + + /* TODO: Support interval < 1. i.e. implement timespec_of_float */ + ti.tv_sec = cfg->interval; + ti.tv_nsec = 0; + if (cfg->fifos == NULL) usage("No fifo specs were given!\n"); @@ -401,14 +481,15 @@ main(int argc, char *argv[]) if (cfg->output_to_x_root_window && !(display = XOpenDisplay(NULL))) fatal("XOpenDisplay failed with: %p\n", display); - /* TODO: nanosleep and nano time diff */ /* TODO: Handle signals */ for (;;) { - /* TODO: Check TTL and maybe blank-out */ + clock_gettime(CLOCK_MONOTONIC, &t0); // FIXME: check errors + /* TODO: Cache expiration. i.e. use the TTL */ /* TODO: How to trigger TTL check? On select? Alarm signal? */ /* TODO: Set timeout on fifo_read_all based on diff of last time of * fifo_read_all and desired time of next TTL check. - * */ + */ + /* TODO: How long to wait on IO? Max TTL? */ fifo_read_all(cfg, buf); if (cfg->output_to_x_root_window) { if (XStoreName(display, DefaultRootWindow(display), buf) < 0) @@ -418,6 +499,19 @@ main(int argc, char *argv[]) puts(buf); fflush(stdout); } + clock_gettime(CLOCK_MONOTONIC, &t1); // FIXME: check errors + timespecsub(&t1, &t0, &td); + debug("td {tv_sec = %ld, tv_nsec = %ld}\n", td.tv_sec, td.tv_nsec); + if (timespeccmp(&td, &ti, <)) { + /* Pushback on data producers by refusing to read the + * pipe more frequently than the interval. + */ + timespecsub(&ti, &td, &tc); + debug("snooze YES\n"); + snooze(&tc, cfg); + } else { + debug("snooze NO\n"); + } } return EXIT_SUCCESS;