X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=bfd5300d2d8ed35c9b9fb3ae3a012a341a1987ff;hb=7ca215713fa73c84ba0b46c9e7299386bd5cf5b8;hp=61ba76d697a0b10e0a4dcd9e2866bb36df899284;hpb=43c1519cb60f8fef09043b9af6f43d319db12e3d;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 61ba76d..bfd5300 100644
--- a/server/main.c
+++ b/server/main.c
@@ -3,21 +3,17 @@
  * @purpose main and its helper functions, signal handling and cleanup functions
  */
 
-#define _POSIX_C_SOURCE 200809L // For strsignal to work
+// --- Custom headers --- //
+#include "common.h"
+#include "options.h"
+#include "sensor.h"
 
 // --- 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 "log.h"
-#include "options.h"
 
 // --- Variable definitions --- //
 Options g_options; // options passed to program through command line arguments
+Sensor g_sensors[NUMSENSORS]; // sensors array
 
 // --- Function definitions --- //
 
@@ -37,12 +33,14 @@ void ParseArguments(int argc, char ** argv)
  * 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, "Got signal %d (%s). Exiting.", sig, strsignal(sig));
-	exit(sig);
+	Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
+	exit(signal);
 }
 
 /**
@@ -63,7 +61,17 @@ void Cleanup()
  */
 int main(int argc, char ** argv)
 {
-	ParseArguments(argc, argv, &g_options);
+	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;
 }