X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c1b883eeca69798387b6cc16bbbfed68e008d93d;hb=a024e27494af5e9273c18b77d5ad73b6d20223e2;hp=0692d6a62eecc2cbbcf24d9e962da5eb7aa17849;hpb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 0692d6a..c1b883e 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -18,6 +18,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include <pthread.h>
 #include "../cokebank.h"
 
 // === IMPORTS ===
@@ -28,10 +29,19 @@ extern int	giServer_Port;
 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()
@@ -42,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++ )
@@ -52,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:
@@ -64,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?
 			}
@@ -92,12 +112,46 @@ int main(int argc, char *argv[])
 
 	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;