#include <X11/Xlib.h>
#include "bsdtimespec.h"
+#include "khatus_lib_log.h"
+#include "khatus_lib_time.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);}
-
+#define usage(...) {print_usage(); fprintf(stderr, "Error:\n " __VA_ARGS__); exit(EXIT_FAILURE);}
#define ERRMSG "ERROR"
static const char errmsg[] = ERRMSG;
char *argv0;
-typedef enum LogLevel {
- Nothing,
- Error,
- Warn,
- Info,
- Debug
-} LogLevel;
-
/* TODO: Convert fifo list to fifo array. */
typedef struct Fifo Fifo;
struct Fifo {
int width;
int last_read;
int ttl;
- int pos; /* Position on the output buffer. */
+ int pos_init; /* Initial position on the output buffer. */
+ int pos_curr; /* Current position on the output buffer. */
+ int pos_final; /* Final position on the output buffer. */
Fifo *next;
};
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;
- LogLevel log_level;
} defaults = {
- .interval = 1,
+ .interval = 1.0,
.separator = "|",
.fifos = NULL,
.fifo_count = 0,
.total_width = 0,
.output_to_x_root_window = 0,
- .log_level = Info,
+};
+
+enum read_status {
+ FAIL_FINAL = -2,
+ FAIL_TMP = -1,
+ END_OF_FILE = 0,
+ END_OF_MESSAGE = 1
};
void
-fifo_print_one(Fifo *f, Config *cfg)
+fifo_print_one(Fifo *f)
{
info("Fifo "
"{"
" width = %d,"
" last_read = %d,"
" ttl = %d,"
- " pos = %d,"
+ " pos_init = %d,"
+ " pos_curr = %d,"
+ " pos_final = %d,"
" next = %p,"
" }\n",
f->name,
f->width,
f->last_read,
f->ttl,
- f->pos,
+ f->pos_init,
+ f->pos_curr,
+ f->pos_final,
f->next
);
}
void
-fifo_print_all(Fifo *head, Config *cfg)
+fifo_print_all(Fifo *head)
{
for (Fifo *f = head; f; f = f->next) {
- fifo_print_one(f, cfg);
+ fifo_print_one(f);
}
}
info(
"Config "
"{"
- " interval = %d,"
+ " interval = %f,"
" 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
+ cfg->total_width
);
- fifo_print_all(cfg->fifos, cfg);
+ fifo_print_all(cfg->fifos);
}
int
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()
{
if (i >= argc)
usage("Option -i parameter is missing.\n");
param = argv[i++];
- if (!is_pos_num(param))
+ if (!is_decimal(param))
usage("Option -i parameter is invalid: \"%s\"\n", param);
- cfg->interval = atoi(param);
+ cfg->interval = atof(param);
opts_parse_any(cfg, argc, argv, i);
}
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;
+ _khatus_lib_log_level = log_level;
opts_parse_any(cfg, argc, argv, i);
}
f->width = atoi(w);
f->ttl = atoi(t);
f->last_read = 0;
- f->pos = cfg->total_width;
+ f->pos_init = cfg->total_width;
+ f->pos_curr = f->pos_init;
+ f->pos_final = f->pos_init + f->width - 1;
f->next = cfg->fifos;
cfg->fifos = f;
char *b;
int i;
- b = buf + f->pos;
+ b = buf + f->pos_init;
/* Copy as much of the error message as possible.
* EXCLUDING the reminating \0. */
for (i = 0; i < errlen && i < f->width; i++)
b[i] = '_';
}
-void
-fifo_read_one(Fifo *f, char *buf, Config *cfg)
+enum read_status
+fifo_read_one(Fifo *f, char *buf)
{
- ssize_t current;
- ssize_t total;
- char *b;
- char c;
+ /* Initialize all to an impossible value: */
+ ssize_t n = -5; /* Number of bytes read. */
+ char c = -1; /* Character read. */
+ int r = -1; /* Remaining unused slots in buffer range. */
- current = 0;
- total = 0;
- c = '\0';
- b = buf + f->pos;
- while ((current = read(f->fd, &c, 1)) && c != '\n' && c != '\0' && total++ < f->width)
- *b++ = c;
- if (current == -1) {
- error("Failed to read: \"%s\". Error: %s\n", f->name, strerror(errno));
- fifo_read_error(f, buf);
- } else {
- while (total++ < f->width)
- *b++ = ' ';
+ for (;;) {
+ n = read(f->fd, &c, 1);
+ assert(n >= -1 && n <= 1);
+ switch (n) {
+ case -1:
+ error("Failed to read: \"%s\". errno: %d, msg: %s\n",
+ f->name, errno, strerror(errno));
+ if (errno == 11)
+ return FAIL_TMP;
+ else
+ return FAIL_FINAL;
+ case 0:
+ debug("%s: End of FILE\n", f->name);
+ f->pos_curr = f->pos_init;
+ return END_OF_FILE;
+ case 1:
+ /* TODO: Consider making msg term char a CLI option */
+ if (c == '\n' || c == '\0') {
+ r = f->pos_final - f->pos_curr;
+ if (r > 0)
+ memset(buf + f->pos_curr, ' ', r);
+ f->pos_curr = f->pos_init;
+ return END_OF_MESSAGE;
+ } else {
+ if (f->pos_curr <= f->pos_final)
+ buf[f->pos_curr++] = c;
+ /* Drop beyond available range. */
+ }
+ break;
+ default:
+ assert(0);
+ }
}
/* TODO Record timestamp read */
- close(f->fd);
- f->fd = -1;
}
void
fifo_read_error(f, buf);
continue;
}
- debug("opening: %s\n", f->name);
- if (f->fd < 0)
+ if (f->fd < 0) {
+ debug("%s: closed. opening. fd: %d\n", f->name, f->fd);
f->fd = open(f->name, O_RDONLY | O_NONBLOCK);
+ } else {
+ debug("%s: already openned. fd: %d\n", f->name, f->fd);
+ }
if (f->fd == -1) {
/* TODO: Consider backing off retries for failed fifos. */
error("Failed to open \"%s\"\n", f->name);
fifo_read_error(f, buf);
continue;
}
+ debug("%s: open. fd: %d\n", f->name, f->fd);
if (f->fd > maxfd)
maxfd = f->fd;
FD_SET(f->fd, &fds);
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, 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));
+ switch (fifo_read_one(f, buf)) {
+ case END_OF_FILE:
+ case FAIL_FINAL:
+ close(f->fd);
+ f->fd = -1;
+ break;
+ case END_OF_MESSAGE:
+ case FAIL_TMP:
+ break;
+ default:
+ assert(0);
+ }
}
}
}
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");
/* 2nd pass to make space for separators */
for (Fifo *f = cfg->fifos; f; f = f->next) {
- f->pos += prefix;
+ f->pos_init += prefix;
+ f->pos_final += prefix;
+ f->pos_curr = f->pos_init;
prefix += seplen;
nfifos++;
}
buf[width] = '\0';
/* 3rd pass to set the separators */
for (Fifo *f = cfg->fifos; f; f = f->next) {
- if (f->pos) { /* Skip the first, left-most */
+ if (f->pos_init) { /* Skip the first, left-most */
/* Copying only seplen ensures we omit the '\0' byte. */
- strncpy(buf + (f->pos - seplen), cfg->separator, seplen);
+ strncpy(buf + (f->pos_init - seplen), cfg->separator, seplen);
}
}
*/
timespecsub(&ti, &td, &tc);
debug("snooze YES\n");
- snooze(&tc, cfg);
+ snooze(&tc);
} else {
debug("snooze NO\n");
}
home / code / khatus.git / blobdiff