Added periodic thread (reloads item config, checks coke slots)

[tpg/opendispense2.git] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 8abb984..5ca4723 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -17,20 +17,31 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <syslog.h>
+#include <pthread.h>
+#include "../cokebank.h"
 
 // === IMPORTS ===
-extern void    Init_Cokebank(const char *Argument);    // cokebank.c
 extern void    Init_Handlers(void);
 extern void    Load_Itemlist(void);
 extern void    Server_Start(void);
 extern int     giServer_Port;
-extern char*   gsItemListFile;
-extern char*   gsCoke_SerialPort;
-extern char*   gsSnack_SerialPort;
+extern char    *gsItemListFile;
+extern char    *gsCoke_SerialPort;
+extern char    *gsSnack_SerialPort;
+extern char    *gsDoor_Password;
+
+// === PROTOTYPES ===
+void   *Periodic_Thread(void *Unused);
 
 // === GLOBALS ===
  int   giDebugLevel = 0;
 char   *gsCokebankPath = "cokebank.db";
+// - Functions called every 20s (or so)
+#define ciMaxPeriodics 10
+struct sPeriodicCall {
+       void    (*Function)(void);
+}      gaPeriodicCalls[ciMaxPeriodics];
 
 // === CODE ===
 void sigint_handler()
@@ -41,6 +52,7 @@ void sigint_handler()
 int main(int argc, char *argv[])
 {
         int    i;
+       pthread_t       timer_thread;
        
        // Parse Arguments
        for( i = 1; i < argc; i++ )
@@ -51,9 +63,11 @@ int main(int argc, char *argv[])
                        switch(arg[1])
                        {
                        case 'p':
+                               if( i + 1 >= argc )     return -1;
                                giServer_Port = atoi(argv[++i]);
                                break;
                        case 'd':
+                               if( i + 1 >= argc )     return -1;
                                giDebugLevel = atoi(argv[++i]);
                                break;
                        default:
@@ -63,14 +77,21 @@ int main(int argc, char *argv[])
                }
                else if( arg[0] == '-' && arg[1] == '-' ) {
                        if( strcmp(arg, "--itemsfile") == 0 ) {
+                               if( i + 1 >= argc )     return -1;
                                gsItemListFile = argv[++i];
                        }
                        else if( strcmp(arg, "--cokeport") == 0 ) {
+                               if( i + 1 >= argc )     return -1;
                                gsCoke_SerialPort = argv[++i];
                        }
                        else if( strcmp(arg, "--snackport") == 0 ) {
+                               if( i + 1 >= argc )     return -1;
                                gsSnack_SerialPort = argv[++i];
                        }
+                       else if( strcmp(arg, "--doorpass") == 0 ) {
+                               if( i + 1 >= argc )     return -1;
+                               gsDoor_Password = argv[++i];
+                       }
                        else {
                                // Usage error?
                        }
@@ -82,23 +103,63 @@ int main(int argc, char *argv[])
        
        signal(SIGINT, sigint_handler);
        
-       Init_Cokebank(gsCokebankPath);
+       openlog("odispense2", 0, LOG_LOCAL4);
+       
+       if( Bank_Initialise(gsCokebankPath) )
+               return -1;
 
        Init_Handlers();
 
        Load_Itemlist();
        
+       pthread_create( &timer_thread, NULL, Periodic_Thread, NULL );
+       
        Server_Start();
        
+       pthread_kill(timer_thread, SIGKILL);
 
        return 0;
 }
 
+void *Periodic_Thread(void *Unused)
+{
+        int    i;
+       Unused = NULL;  // quiet, gcc
+       
+       for( ;; )
+       {
+               sleep(10);      // Sleep for a while
+               printf("Periodic firing\n");
+               for( i = 0; i < ciMaxPeriodics; i ++ )
+               {
+                       if( gaPeriodicCalls[i].Function )
+                               gaPeriodicCalls[i].Function();
+               }
+       }
+       return NULL;
+}
+
+void AddPeriodicFunction(void (*Fcn)(void))
+{
+       int i;
+       for( i = 0; i < ciMaxPeriodics; i ++ )
+       {
+               if( gaPeriodicCalls[i].Function )       continue;
+               gaPeriodicCalls[i].Function = Fcn;
+               return ;
+       }
+       
+       fprintf(stderr, "Error: No space for %p in periodic list\n", Fcn);
+}
+
 int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage)
 {
         int    ret;
        
        ret = regexec(regex, string, nMatches, matches, 0);
+       if( ret == REG_NOMATCH ) {
+               return -1;
+       }
        if( ret ) {
                size_t  len = regerror(ret, regex, NULL, 0);
                char    errorStr[len];