remove workaround, now reopen trinket every loop

[trinked.git] / main.c

diff --git a/main.c b/main.c
index c5ff3a9..4552672 100644 (file)
--- a/main.c
+++ b/main.c
@@ -38,11 +38,11 @@
 #include <trinket.h>
 
 static char*   dbdir = NULL;
-static int             period = (300); /* in seconds */
+static int             period = 300; /* in seconds */
+static int             tics = 1;
 static char*   pidfile = NULL;
 static char*   logfile = NULL;
 static bool            daemonize = false;
-static bool            workaround = false;
 static char            tfile[MAXPATHLEN],
                                ofile[MAXPATHLEN];
 
@@ -52,7 +52,7 @@ static void
 usage(const char *errmsg) {
        puts("trinketd - collecting info from AtomPro");
        puts("Copyright (c) 2016, Teodor Sigaev <teodor@sigaev.ru>");
-       puts("trinketd [-d] [-l logfile] [-p pidfile] [-P period] [-D datadir] [-w]");
+       puts("trinketd [-d] [-l logfile] [-p pidfile] [-P period] [-D datadir] [-i tics]");
 
        if (errmsg) {
                puts("");
@@ -64,32 +64,46 @@ usage(const char *errmsg) {
 
 static void
 main_loop() {
-       double  prevDose,
+       double  *prevDose,
                        curDose;
+       int             i;
+       int             collected = 0;
 
-restart:
-       prevDose = -1;
-
-       if (trinketOpen() != ERR_OK) {
-               fprintf(stderr, "trinketOpen fails\n");
-               sleep(1);
-               goto restart;
+       prevDose = malloc(sizeof(*prevDose) * (tics + 1));
+       if (!prevDose) {
+               fprintf(stderr, "could not allocate array, exiting...\n");
+               return;
        }
 
+       collected = 0;
+
        while(42) {
-               if (workaround)
-                       trinketPing();
+
+               if (trinketOpen() != ERR_OK) {
+                       fprintf(stderr, "trinketOpen fails\n");
+                       sleep(1);
+                       continue;
+               }
 
                if (trinketGetCumDose(&curDose) != ERR_OK) {
                        fprintf(stderr, "trinketGetCumDose fails\n");
                        trinketClose();
                        sleep(1);
-                       goto restart;
+                       continue;
+               }
+
+               if (collected <= tics) {
+                       prevDose[collected++] = curDose;
+               } else {
+                       for (i=1; i<=tics; i++)
+                               prevDose[i - 1] = prevDose[i];
+                       prevDose[tics] = curDose;
                }
 
-               if (prevDose >= 0.0) {
-                       double  counts = curDose - prevDose;
-                       double  radlevel = 1e6 * coefficient * counts * 3600.0 / (double)period;
+               if (collected > 1) {
+                       double  counts = curDose - prevDose[0];
+                       double  radlevel = 1e6 * coefficient * counts * 3600.0 /
+                                                               (double)(period * (collected - 1));
                        FILE    *fh = stdout;
                        bool    successOpen = true;
 
@@ -103,6 +117,7 @@ restart:
                        if (successOpen) {
                                fprintf(fh, "total: %lld\n", (long long)curDose);
                                fprintf(fh, "counts: %lld\n", (long long)counts);
+                               fprintf(fh, "tics: %d\n", collected - 1);
                                fprintf(fh, "radlevel: %.02f\n", radlevel);
                        }
 
@@ -113,11 +128,9 @@ restart:
                        }
                }
 
-               prevDose = curDose;
+               trinketClose();
                sleep(period);
        }
-
-       trinketClose();
 }
 
 
@@ -131,7 +144,7 @@ main(int argn, char* argv[]) {
                logfd;
 
        opterr = 0;
-       while((i=getopt(argn,argv,"dD:p:P:wh")) != EOF) {
+       while((i=getopt(argn,argv,"dD:i:l:p:P:h")) != EOF) {
                switch(i) {
                        case 'd':
                                daemonize = true;
@@ -139,15 +152,18 @@ main(int argn, char* argv[]) {
                        case 'D':
                                dbdir = strdup(optarg);
                                break;
+                       case 'i':
+                               tics = atoi(optarg);
+                               break;
+                       case 'l':
+                               logfile = strdup(optarg);
+                               break;
                        case 'p':
                                pidfile = strdup(optarg);
                                break;
                        case 'P':
                                period = atoi(optarg);
                                break;
-                       case 'w':
-                               workaround = true;
-                               break;
                        case 'h':
                        default:
                                usage(NULL);
@@ -160,6 +176,9 @@ main(int argn, char* argv[]) {
        if (period <= 0)
                usage("Collecting period could not be zero nor negative");
 
+       if (tics <= 0)
+               usage("Number of tics could not be zero nor negative");
+
        if (daemonize && !dbdir)
                usage("trinketd: it is useless to use -d without -D");