Use experiment folders instead of chdir

[matches/MCTX3420.git] / server / main.c

diff --git a/server/main.c b/server/main.c
index ecdf068..e7edc7e 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -16,6 +16,7 @@
 #include <syslog.h> // for system logging
 #include <signal.h> // for signal handling
 
+
 // --- Variable definitions --- //
 Options g_options; // options passed to program through command line arguments
 
@@ -28,19 +29,20 @@ Options g_options; // options passed to program through command line arguments
  */
 void ParseArguments(int argc, char ** argv)
 {
-
-
        g_options.program = argv[0]; // program name
        g_options.verbosity = LOGDEBUG; // default log level
+       // Set the main directory
+       //if (getcwd(g_options.root_dir, sizeof(g_options.root_dir)) == NULL)
+       //      Fatal("Couldn't get current working directory - %s", strerror(errno));
+
        gettimeofday(&(g_options.start_time), NULL); // Start time
 
 
        g_options.auth_method = AUTH_NONE;  // Don't use authentication
        g_options.auth_uri = ""; // 
        g_options.ldap_base_dn = "";
+       g_options.experiment_dir = ".";
        
-
-
        for (int i = 1; i < argc; ++i)
        {
                if (argv[i][0] != '-')
@@ -71,6 +73,10 @@ void ParseArguments(int argc, char ** argv)
                        case 'd':
                                g_options.ldap_base_dn = argv[++i];
                                break;
+                       case 'e':
+                       // Experiments directory
+                               g_options.experiment_dir = argv[++i];
+                               break;
                        default:
                                Fatal("Unrecognised switch %s", argv[i]);
                                break;
@@ -84,6 +90,13 @@ void ParseArguments(int argc, char ** argv)
        Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
        Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
        Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
+       //Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
+       Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir);
+
+       if (!DirExists(g_options.experiment_dir))
+       {
+               Fatal("Experiment directory '%s' does not exist.", g_options.experiment_dir);
+       }
 
        if (g_options.auth_uri[0] != '\0')
        {
@@ -96,30 +109,15 @@ 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.", signal, strsignal(signal));
-
-       //exit(signal);
-}
-
 /**
  * Cleanup before the program exits
  */
 void Cleanup()
 {
        Log(LOGDEBUG, "Begin cleanup.");
+       Sensor_Cleanup();
+       //Actuator_Cleanup();
        Log(LOGDEBUG, "Finish cleanup.");
-
 }
 
 /**
@@ -135,33 +133,26 @@ int main(int argc, char ** argv)
        openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
        Log(LOGINFO, "Server started");
 
-       ParseArguments(argc, argv);
-
-       //Open the system log
+       ParseArguments(argc, argv); // Setup the g_options structure from program arguments
 
-       // 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();
        Pin_Init();
-       //Sensor_StartAll("test");
-       //Actuator_StartAll("test");
+       
+       // Try and start things
+       /*
        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();