X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=c032eb10739f046fdf4489fdd77a9acd41fb8739;hb=a38be3223efa75bb469d25812468e7e943affe5a;hp=71f2aba24ef4b4e5f52e61524a6013b9130c191d;hpb=b1a8334f97f84e10ee9cef96377bbdcfbf5f945c;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 71f2aba..c032eb1 100644
--- a/server/main.c
+++ b/server/main.c
@@ -1,20 +1,18 @@
 /**
  * @file main.c
- * @purpose Entry point to the program, starts threads, handles cleanup on program exit
+ * @brief 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"
+#include "actuator.h"
+#include "control.h"
 
 // --- Standard headers --- //
-#include <stdlib.h>
-#include <stdio.h>
+#include <syslog.h> // for system logging
 #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
@@ -22,52 +20,84 @@ Options g_options; // options passed to program through command line arguments
 // --- Function definitions --- //
 
 /**
- * @funct ParseArguments
- * @purpose Parse command line arguments, set up an options variable
- * @param argc - Num args
- * @param argv - Array of args
- * @param opts - Pointer to options.  &g_options
+ * Parse command line arguments, initialise g_options
+ * @param argc - Number of arguments
+ * @param argv - Array of argument strings
  */
-void ParseArguments(int argc, char ** argv, Options * opts)
+void ParseArguments(int argc, char ** argv)
 {
-	opts->program = argv[0]; // program name
-	opts->verbosity = LOGDEBUG; // default log level
-	Log(LOGDEBUG, "ParseArguments", "Called as %s with %d arguments.", opts->program, argc);
+	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);
 }
 
 /**
- * @funct SignalHandler
- * @purpose Handle signals
- * @param sig - The signal
+ * Handle a signal
+ * @param signal - The signal number
  */
-void SignalHandler(int sig)
+//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, "SignalHandler", "Got signal %d (%s). Exiting.", sig, strsignal(sig));
-	exit(sig);
+	Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
+
+	//exit(signal);
 }
 
 /**
- * @funct Cleanup
- * @purpose Called when program exits
+ * Cleanup before the program exits
  */
 void Cleanup()
 {
-	Log(LOGDEBUG, "Cleanup", "Begin cleanup.");
-	Log(LOGDEBUG, "Cleanup", "Finish cleanup.");
+	Log(LOGDEBUG, "Begin cleanup.");
+	Log(LOGDEBUG, "Finish cleanup.");
 
 }
 
 /**
- * @funct main
- * @purpose Main entry point; start worker threads, setup signal handling, wait for threads to exit, exit
+ * Main entry point; start worker threads, setup signal handling, wait for threads to exit, exit
  * @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);
+
+	//Open the system log
+	openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+	Log(LOGINFO, "Server started");
+	// 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_Init();
+	Actuator_Init();
+	//Sensor_StartAll("test");
+	//Actuator_StartAll("test");
+	const char *ret;
+	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
+
+	// run request thread in the main thread
+	FCGI_RequestLoop(NULL);
+
+	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
+	//Sensor_StopAll();
+	//Actuator_StopAll();
+
+	Cleanup();
 	return 0;
 }