#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 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,
- Info,
- Debug
-} LogLevel;
-
/* TODO: Convert fifo list to fifo array. */
typedef struct Fifo Fifo;
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;
- 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,
};
void
-fifo_print_one(Fifo *f, Config *cfg)
+fifo_print_one(Fifo *f)
{
- 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
+ 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, Config *cfg)
+fifo_print_all(Fifo *head)
{
for (Fifo *f = head; f; f = f->next) {
- fifo_print_one(f, cfg);
+ fifo_print_one(f);
}
}
config_print(Config *cfg)
{
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
+ "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(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()
{
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"
- " | -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
+ 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
);
}
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);
}
}
void
-fifo_read_one(Fifo *f, char *buf, Config *cfg)
+fifo_read_one(Fifo *f, char *buf)
{
ssize_t current;
ssize_t total;
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;
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) {
- 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));
+ fifo_read_one(f, buf);
}
}
}
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");
*/
timespecsub(&ti, &td, &tc);
debug("snooze YES\n");
- snooze(&tc, cfg);
- } else
+ snooze(&tc);
+ } else {
debug("snooze NO\n");
+ }
}
return EXIT_SUCCESS;
home / code / khatus.git / blobdiff