Support sub-second intervals

[khatus.git] / x5 / khatus.c

diff --git a/x5/khatus.c b/x5/khatus.c
index 16c9a56..b6f66f7 100644 (file)
--- a/x5/khatus.c
+++ b/x5/khatus.c
@@ -14,14 +14,10 @@
 #include <X11/Xlib.h>
 
 #include "bsdtimespec.h"
+#include "khatus_lib_log.h"
+#include "khatus_lib_time.h"
 
-#define debug(...) if (cfg->log_level >= Debug) {fprintf(stderr, "[debug] " __VA_ARGS__); fflush(stderr);}
-#define info(...)  if (cfg->log_level >= Info ) {fprintf(stderr, "[info] "  __VA_ARGS__); fflush(stderr);}
-#define warn(...)  if (cfg->log_level >= Warn ) {fprintf(stderr, "[warn] "  __VA_ARGS__); fflush(stderr);}
-#define error(...) if (cfg->log_level >= Error) {fprintf(stderr, "[error] " __VA_ARGS__); fflush(stderr);}
-#define fatal(...) {fprintf(stderr, "[fatal] " __VA_ARGS__); exit(EXIT_FAILURE);}
-#define usage(...) {print_usage(); fatal("[usage] " __VA_ARGS__);}
-
+#define usage(...) {print_usage(); fprintf(stderr, "Error:\n    " __VA_ARGS__); exit(EXIT_FAILURE);}
 #define ERRMSG "ERROR"
 
 static const char errmsg[] = ERRMSG;
@@ -29,14 +25,6 @@ static const int  errlen   = sizeof(ERRMSG) - 1;
 
 char *argv0;
 
-typedef enum LogLevel {
-       Nothing,
-       Error,
-       Warn,
-       Info,
-       Debug
-} LogLevel;
-
 /* TODO: Convert fifo list to fifo array. */
 typedef struct Fifo Fifo;
 struct Fifo {
@@ -51,25 +39,23 @@ 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 "
            "{"
@@ -92,10 +78,10 @@ fifo_print_one(Fifo *f, Config *cfg)
 }
 
 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);
        }
 }
 
@@ -105,20 +91,18 @@ config_print(Config *cfg)
        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
@@ -130,6 +114,22 @@ 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()
 {
@@ -173,9 +173,9 @@ parse_opts_opt_i(Config *cfg, int argc, char *argv[], int i)
        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);
 }
 
@@ -203,7 +203,7 @@ parse_opts_opt_l(Config *cfg, int argc, char *argv[], int 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);
 }
 
@@ -311,7 +311,7 @@ fifo_read_error(Fifo *f, char *buf)
 }
 
 void
-fifo_read_one(Fifo *f, char *buf, Config *cfg)
+fifo_read_one(Fifo *f, char *buf)
 {
        ssize_t current;
        ssize_t total;
@@ -379,30 +379,7 @@ fifo_read_all(Config *cfg, char *buf)
        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));
+                       fifo_read_one(f, buf);
                }
        }
 }
@@ -433,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");
@@ -508,7 +483,7 @@ main(int argc, char *argv[])
                         */
                        timespecsub(&ti, &td, &tc);
                        debug("snooze YES\n");
-                       snooze(&tc, cfg);
+                       snooze(&tc);
                } else {
                        debug("snooze NO\n");
                }