X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=596fb39afdb05cc6846a1dd79ca699008b2c2e28;hb=ba5dfc10d915ec3d2abcd08e1582309e76dbb264;hp=56794f231d5970478272c11b25c3ed668e92762e;hpb=733a9b968264c48b5340693ce17e1874c1aeff77;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 56794f2..596fb39 100644
--- a/server/main.c
+++ b/server/main.c
@@ -2,22 +2,21 @@
  * @file main.c
  * @purpose main and its helper functions, signal handling and cleanup functions
  */
+#include "common.h"
 
-#define _POSIX_C_SOURCE 200809L // For strsignal to work
 
 // --- Standard headers --- //
-#include <stdlib.h>
-#include <stdio.h>
 #include <signal.h> // for signal handling
-#include <string.h> // string functions
-#include <pthread.h>
 
 // --- Custom headers --- //
+#include "fastcgi.h"
 #include "log.h"
 #include "options.h"
+#include "sensor.h"
 
 // --- Variable definitions --- //
 Options g_options; // options passed to program through command line arguments
+Sensor g_sensors[NUMSENSORS]; // sensors array
 
 // --- Function definitions --- //
 
@@ -30,19 +29,21 @@ void ParseArguments(int argc, char ** argv)
 {
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
-	Log(LOGDEBUG, "ParseArguments", "Called as %s with %d arguments.", g_options.program, argc);
+	Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
 }
 
 /**
  * Handle a signal
  * @param signal - The signal number
  */
+//TODO: Something that gets massively annoying with threads is that you can't predict which one gets the signal
+// There are ways to deal with this, but I can't remember them
 void SignalHandler(int signal)
 {
 	// At the moment just always exit.
 	// Call `exit` so that Cleanup will be called to... clean up.
-	Log(LOGWARN, "SignalHandler", "Got signal %d (%s). Exiting.", signal, strsignal(signal));
-	exit(sig);
+	Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
+	exit(signal);
 }
 
 /**
@@ -50,8 +51,8 @@ void SignalHandler(int signal)
  */
 void Cleanup()
 {
-	Log(LOGDEBUG, "Cleanup", "Begin cleanup.");
-	Log(LOGDEBUG, "Cleanup", "Finish cleanup.");
+	Log(LOGDEBUG, "Begin cleanup.");
+	Log(LOGDEBUG, "Finish cleanup.");
 
 }
 
@@ -63,6 +64,17 @@ void Cleanup()
  */
 int main(int argc, char ** argv)
 {
+	ParseArguments(argc, argv);
+
+	// start sensor threads
+	for (int i = 0; i < NUMSENSORS; ++i)
+	{
+		Sensor_Init(g_sensors+i, i);
+		pthread_create(&(g_sensors[i].thread), NULL, Sensor_Main, (void*)(g_sensors+i));
+	}
+
+	// run request thread in the main thread
+	FCGI_RequestLoop(NULL);
 	return 0;
 }