X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=5e2c6c8b27a1460f9bbaf2a960bcef6713106e6e;hb=69483d953c93566731f72445a077dfcf60e01bf3;hp=71f2aba24ef4b4e5f52e61524a6013b9130c191d;hpb=b1a8334f97f84e10ee9cef96377bbdcfbf5f945c;p=matches%2FMCTX3420.git diff --git a/server/main.c b/server/main.c index 71f2aba..5e2c6c8 100644 --- a/server/main.c +++ b/server/main.c @@ -1,73 +1,80 @@ /** * @file main.c - * @purpose Entry point to the program, starts threads, handles cleanup on program exit + * @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 -#include #include // for signal handling -#include // string functions -#include // --- Custom headers --- // +#include "query.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 --- // /** - * @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 + 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 +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 */ 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 + Query_Main(NULL); //TODO: Replace with FastCGI code return 0; }