X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x5%2Fkhatus.c;h=b6f66f7a1134923d8733a18016bb7404d9f4ecd3;hb=348d5f367c12e60de79ac4647417aa7184996d06;hp=b835ad8fe2f756a8f4c2635c53e960e55e0d6ac3;hpb=01936218a441986666f4e0fcfb4ae8d22f7be891;p=khatus.git diff --git a/x5/khatus.c b/x5/khatus.c index b835ad8..b6f66f7 100644 --- a/x5/khatus.c +++ b/x5/khatus.c @@ -14,13 +14,10 @@ #include #include "bsdtimespec.h" +#include "khatus_lib_log.h" +#include "khatus_lib_time.h" -#define debug(args...) {fprintf(stderr, "[debug] " args); fflush(stderr);} -#define info( args...) {fprintf(stderr, "[info] " args); fflush(stderr);} -#define error(args...) {fprintf(stderr, "[error] " args); fflush(stderr);} -#define fatal(args...) {fprintf(stderr, "[fatal] " args); exit(EXIT_FAILURE);} -#define usage(args...) {print_usage(); fatal("[usage] " args);} - +#define usage(...) {print_usage(); fprintf(stderr, "Error:\n " __VA_ARGS__); exit(EXIT_FAILURE);} #define ERRMSG "ERROR" static const char errmsg[] = ERRMSG; @@ -42,14 +39,14 @@ struct Fifo { typedef struct Config Config; struct Config { - int interval; + double interval; char * separator; Fifo * fifos; int fifo_count; int total_width; int output_to_x_root_window; } defaults = { - .interval = 1, + .interval = 1.0, .separator = "|", .fifos = NULL, .fifo_count = 0, @@ -60,24 +57,23 @@ struct Config { void fifo_print_one(Fifo *f) { - 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 ); } @@ -90,23 +86,23 @@ fifo_print_all(Fifo *head) } 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 = %f," + " separator = %s," + " fifo_count = %d," + " total_width = %d," + " fifos = ..." + " }\n", + cfg->interval, + cfg->separator, + cfg->fifo_count, + cfg->total_width ); - fifo_print_all(c->fifos); + fifo_print_all(cfg->fifos); } int @@ -118,32 +114,52 @@ is_pos_num(char *s) return 1; } +int +is_decimal(char *s) +{ + char c; + int seen = 0; + + while ((c = *(s++)) != '\0') + if (!isdigit(c)) { + if (c == '.' && !seen++) + continue; + else + return 0; + } + return 1; +} + void 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" - " | -x (* Output to X root window *)\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 ); } @@ -152,50 +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_decimal(param)) + usage("Option -i parameter is invalid: \"%s\"\n", param); + cfg->interval = atof(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); + _khatus_lib_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': - /* 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; - 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]); } } @@ -237,11 +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); } } } @@ -294,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; @@ -350,29 +384,6 @@ fifo_read_all(Config *cfg, char *buf) } } -void -snooze(struct timespec *t) -{ - struct timespec remainder; - int result; - - result = nanosleep(t, &remainder); - - if (result < 0) { - if (errno == EINTR) { - info( - "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)); - } - } -} - int main(int argc, char *argv[]) { @@ -399,9 +410,7 @@ main(int argc, char *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; + ti = timespec_of_float(cfg->interval); if (cfg->fifos == NULL) usage("No fifo specs were given!\n"); @@ -475,8 +484,9 @@ main(int argc, char *argv[]) timespecsub(&ti, &td, &tc); debug("snooze YES\n"); snooze(&tc); - } else + } else { debug("snooze NO\n"); + } } return EXIT_SUCCESS;