X-Git-Url: https://git.xandkar.net/?p=khatus.git;a=blobdiff_plain;f=x5%2Fkhatus.c;h=4dd42da54409bc9d19eb712982c535ec1ac85ccd;hp=6ffa538339d005138ac8b5e0cd3c9d59cb7c092d;hb=16e0239d76a7de132b20a564cc2c14ff2358ecf2;hpb=716cc2b4b0f4aa2e92b0bc75220128a49cd0921a

diff --git a/x5/khatus.c b/x5/khatus.c
index 6ffa538..4dd42da 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;
@@ -47,13 +51,6 @@ struct Config {
 	int    fifo_count;
 	int    total_width;
 	int    output_to_x_root_window;
-} defaults = {
-	.interval    = 1.0,
-	.separator   = "|",
-	.fifos       = NULL,
-	.fifo_count  = 0,
-	.total_width = 0,
-	.output_to_x_root_window = 0,
 };
 
 enum read_status {
@@ -178,7 +175,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 +215,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 +253,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++];
@@ -379,6 +384,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:
@@ -400,7 +410,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;
 		}
@@ -416,7 +430,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;
@@ -429,8 +443,19 @@ 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);
+	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) {
@@ -474,15 +499,22 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf)
 int
 main(int argc, char *argv[])
 {
+	Config cfg = {
+		.interval    = 1.0,
+		.separator   = "|",
+		.fifos       = NULL,
+		.fifo_count  = 0,
+		.total_width = 0,
+		.output_to_x_root_window = 0,
+	};
+
 	int width  = 0;
 	int nfifos = 0;
 	int seplen = 0;
 	int prefix = 0;
 	int errors = 0;
 	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 */
@@ -493,19 +525,23 @@ main(int argc, char *argv[])
 
 	argv0 = argv[0];
 
-	opts_parse(cfg, argc, argv);
+	opts_parse(&cfg, argc, argv);
 	debug("argv0 = %s\n", argv0);
-	config_print(cfg);
+	config_print(&cfg);
 
-	ti = timespec_of_float(cfg->interval);
+	ti = timespec_of_float(cfg.interval);
 
-	if (cfg->fifos == NULL)
+	if (cfg.fifos == NULL)
 		usage("No fifo specs were given!\n");
 
 	/* 1st pass to check file existence and type */
-	for (Fifo *f = cfg->fifos; f; f = f->next) {
+	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;
 		}
@@ -516,13 +552,13 @@ 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);
+	width  = cfg.total_width;
+	seplen = strlen(cfg.separator);
 
 	/* 2nd pass to make space for separators */
-	for (Fifo *f = cfg->fifos; f; f = f->next) {
+	for (Fifo *f = cfg.fifos; f; f = f->next) {
 		f->pos_init  += prefix;
 		f->pos_final += prefix;
 		f->pos_curr = f->pos_init;
@@ -536,30 +572,38 @@ main(int argc, char *argv[])
 	memset(buf, ' ', width);
 	buf[width] = '\0';
 	/* 3rd pass to set the separators */
-	for (Fifo *f = cfg->fifos; f; f = f->next) {
+	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)
+		fifo_read_all(&cfg, &ti, buf);
+		if (cfg.output_to_x_root_window) {
+			if (XStoreName(d, DefaultRootWindow(d), buf) < 0)
 				fatal("XStoreName failed.\n");
-			XFlush(display);
+			XFlush(d);
 		} else {
 			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);
+		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.