X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x5%2Fkhatus.c;h=0580430983777265a6613b436b574d8a056dfbfb;hb=9f40d4f2b2de2db149556318ec6f84994174ca6d;hp=ce7db950a1355212c614d9554f1975f1e5fb2e24;hpb=eb6dbe7a1ae8ed5ff871a4a98a4e95793155d5e0;p=khatus.git diff --git a/x5/khatus.c b/x5/khatus.c index ce7db95..0580430 100644 --- a/x5/khatus.c +++ b/x5/khatus.c @@ -17,7 +17,11 @@ #include "khatus_lib_log.h" #include "khatus_lib_time.h" -#define usage(...) {print_usage(); fprintf(stderr, "Error:\n " __VA_ARGS__); exit(EXIT_FAILURE);} +#define usage(...) { \ + print_usage(); \ + fprintf(stderr, "Error:\n " __VA_ARGS__); \ + exit(EXIT_FAILURE); \ +} #define ERRMSG "ERROR" static const char errmsg[] = ERRMSG; @@ -178,7 +182,8 @@ print_usage() ); } -void opts_parse_any(Config *, int, char *[], int); /* For mutually-recursive calls. */ +/* For mutually-recursive calls. */ +void opts_parse_any(Config *, int, char *[], int); void parse_opts_opt_i(Config *cfg, int argc, char *argv[], int i) @@ -217,7 +222,11 @@ parse_opts_opt_l(Config *cfg, int argc, char *argv[], int i) 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); + 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); } @@ -251,7 +260,10 @@ void parse_opts_spec(Config *cfg, int argc, char *argv[], int i) { if ((i + 3) > argc) - usage("[spec] Parameter(s) missing for fifo \"%s\".\n", argv[i]); + usage( + "[spec] Parameter(s) missing for fifo \"%s\".\n", + argv[i] + ); char *n = argv[i++]; char *w = argv[i++]; @@ -316,7 +328,7 @@ opts_parse(Config *cfg, int argc, char *argv[]) } void -fifo_expire_one(Fifo *f, struct timespec t, char *buf) +fifo_expire(Fifo *f, struct timespec t, char *buf) { struct timespec td; @@ -328,15 +340,6 @@ fifo_expire_one(Fifo *f, struct timespec t, char *buf) } } -void -fifo_expire_all(Config *cfg, struct timespec t, char *buf) -{ - Fifo *f; - - for (f = cfg->fifos; f; f = f->next) - fifo_expire_one(f, t, buf); -} - void fifo_read_error(Fifo *f, char *buf) { @@ -388,6 +391,11 @@ fifo_read_one(Fifo *f, struct timespec t, char *buf) if (f->pos_curr <= f->pos_final) buf[f->pos_curr++] = c; /* Drop beyond available range. */ + /* + * TODO Define max after which we stop reading. + * To ensure that a rogue large message + * doesn't trap us here. + */ } break; default: @@ -409,7 +417,11 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf) 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) { - error("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno)); + error( + "Cannot stat \"%s\". Error: %s\n", + f->name, + strerror(errno) + ); fifo_read_error(f, buf); continue; } @@ -425,7 +437,7 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf) debug("%s: already openned. fd: %d\n", f->name, f->fd); } if (f->fd == -1) { - /* TODO: Consider backing off retries for failed fifos. */ + /* TODO Consider backing off retries for failed fifos */ error("Failed to open \"%s\"\n", f->name); fifo_read_error(f, buf); continue; @@ -438,9 +450,21 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf) debug("selecting...\n"); ready = pselect(maxfd + 1, &fds, NULL, NULL, ti, NULL); debug("ready: %d\n", ready); - assert(ready >= 0); clock_gettime(CLOCK_MONOTONIC, &t); - while (ready) { + if (ready == -1) { + switch (errno) { + case EINTR: + error("pselect temp failure: %d, errno: %d, msg: %s\n", + ready, errno, strerror(errno)); + /* TODO: Reconsider what to do here. */ + return; + default: + fatal("pselect failed: %d, errno: %d, msg: %s\n", + ready, errno, strerror(errno)); + } + } + /* At-least-once ensures that expiries are still checked on timeouts. */ + do { for (Fifo *f = cfg->fifos; f; f = f->next) { if (FD_ISSET(f->fd, &fds)) { debug("reading: %s\n", f->name); @@ -471,9 +495,11 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf) default: assert(0); } + } else { + fifo_expire(f, t, buf); } } - } + } while (ready); assert(ready == 0); } @@ -488,7 +514,7 @@ main(int argc, char *argv[]) char *buf; Config cfg0 = defaults; Config *cfg = &cfg0; - Display *display = NULL; + Display *d = NULL; struct stat st; struct timespec t0, /* time stamp. before reading fifos */ @@ -511,7 +537,11 @@ main(int argc, char *argv[]) /* 1st pass to check file existence and type */ for (Fifo *f = cfg->fifos; f; f = f->next) { if (lstat(f->name, &st) < 0) { - error("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno)); + error( + "Cannot stat \"%s\". Error: %s\n", + f->name, + strerror(errno) + ); errors++; continue; } @@ -522,7 +552,7 @@ main(int argc, char *argv[]) } } if (errors) - fatal("Encountered errors with the given file paths. See log.\n"); + fatal("Encountered errors with given file paths. See log.\n"); width = cfg->total_width; seplen = strlen(cfg->separator); @@ -545,35 +575,35 @@ main(int argc, char *argv[]) for (Fifo *f = cfg->fifos; f; f = f->next) { if (f->pos_init) { /* Skip the first, left-most */ /* Copying only seplen ensures we omit the '\0' byte. */ - strncpy(buf + (f->pos_init - seplen), cfg->separator, seplen); + strncpy( + buf + (f->pos_init - seplen), + cfg->separator, + seplen + ); } } - if (cfg->output_to_x_root_window && !(display = XOpenDisplay(NULL))) - fatal("XOpenDisplay failed with: %p\n", display); + if (cfg->output_to_x_root_window && !(d = XOpenDisplay(NULL))) + fatal("XOpenDisplay failed with: %p\n", d); /* TODO: Handle signals */ for (;;) { clock_gettime(CLOCK_MONOTONIC, &t0); // FIXME: check errors fifo_read_all(cfg, &ti, buf); if (cfg->output_to_x_root_window) { - if (XStoreName(display, DefaultRootWindow(display), buf) < 0) + if (XStoreName(d, DefaultRootWindow(d), buf) < 0) fatal("XStoreName failed.\n"); - XFlush(display); + XFlush(d); } else { puts(buf); fflush(stdout); } - - /* - * This is a good place for expiry check, since we're about to - * sleep anyway and the time taken by the check will be - * subtracted from the sleep period. - */ - fifo_expire_all(cfg, t0, buf); - 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); + 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.