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

diff --git a/server/main.c b/server/main.c
index 61ba76d..ec21a25 100644
--- a/server/main.c
+++ b/server/main.c
@@ -3,18 +3,13 @@
  * @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
@@ -30,6 +25,7 @@ void ParseArguments(int argc, char ** argv)
 {
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
+	gettimeofday(&(g_options.start_time), NULL); // Start time
 	Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
 }
 
@@ -37,12 +33,16 @@ 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
+// Probably sufficient to just call Thread_QuitProgram here
 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));
+	Thread_QuitProgram(false);
+	//exit(signal);
 }
 
 /**
@@ -60,10 +60,31 @@ void Cleanup()
  * @param argc - Num args
  * @param argv - Args
  * @returns 0 on success, error code on failure
+ * NOTE: NEVER USE exit(3)! Instead call Thread_QuitProgram
  */
 int main(int argc, char ** argv)
 {
-	ParseArguments(argc, argv, &g_options);
+	ParseArguments(argc, argv);
+
+	// signal handler
+	//TODO: Make this work
+	/*
+	int signals[] = {SIGINT, SIGSEGV, SIGTERM};
+	for (int i = 0; i < sizeof(signals)/sizeof(int); ++i)
+	{
+		signal(signals[i], SignalHandler);
+	}
+	*/
+	Sensor_Spawn();
+
+	// run request thread in the main thread
+	FCGI_RequestLoop(NULL);
+
+	// Join the dark side, Luke
+	// *cough*
+	// Join the sensor threads
+	Sensor_Join();
+	Cleanup();
 	return 0;
 }