X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=2ca053e11116f71673060c03f451685e8fc7c482;hb=15a32ab1123375e1a52c319fca71ab8d02c58261;hp=7933bab7c3394b60f07746fdec199e143dc2ed57;hpb=e3e7914fe2f59765e5f92371329652a02518928c;p=matches%2FMCTX3420.git diff --git a/server/main.c b/server/main.c index 7933bab..2ca053e 100644 --- a/server/main.c +++ b/server/main.c @@ -17,6 +17,13 @@ #include // for signal handling +#ifdef REALTIME_VERSION +#include +#include +#include +#include +#endif //REALTIME_VERSION + // --- Variable definitions --- // Options g_options; // options passed to program through command line arguments @@ -29,23 +36,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)); + //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 + clock_gettime(CLOCK_MONOTONIC, &(g_options.start_time)); // Start time g_options.auth_method = AUTH_NONE; // Don't use authentication g_options.auth_uri = ""; // - g_options.ldap_base_dn = ""; + g_options.auth_options = ""; + g_options.experiment_dir = "."; - - for (int i = 1; i < argc; ++i) { if (argv[i][0] != '-') @@ -68,13 +72,13 @@ void ParseArguments(int argc, char ** argv) case 'p': g_options.enable_pin = !(strtol(argv[++i], &end, 10)); break; - // LDAP URI + // Authentication URI and options case 'A': g_options.auth_uri = argv[++i]; break; - // LDAP DN - case 'd': - g_options.ldap_base_dn = argv[++i]; + case 'e': + // Experiments directory + g_options.experiment_dir = argv[++i]; break; default: Fatal("Unrecognised switch %s", argv[i]); @@ -85,20 +89,67 @@ void ParseArguments(int argc, char ** argv) Fatal("argv[%d] -%c requires an integer (got \"%s\" instead)", i-1, argv[i-1][0], argv[i]); } - Log(LOGDEBUG, "Verbosity: %d", g_options.verbosity); - 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); + + + if (!DirExists(g_options.experiment_dir)) + { + Fatal("Experiment directory '%s' does not exist.", g_options.experiment_dir); + } if (g_options.auth_uri[0] != '\0') { - //HACK... - if (PathExists(g_options.auth_uri)) - g_options.auth_method = AUTH_SHADOW; - else - g_options.auth_method = AUTH_LDAP; + // Get the options part of the URI if it exists + char * c = (char*)g_options.auth_uri; + while (*(++c) != '\0' && *c != '#'); + + if (*(c++) == '#') + { + *(c-1) = '\0'; + g_options.auth_options = c; + } + + // Use the first part of the URI to identify the protocol: + c = (char*)g_options.auth_uri; + while (*(++c) != '\0' && *c != ':'); + + if (*c == '\0') // No ':' means no protocol; use plaintext file + { + g_options.auth_method = AUTH_SHADOW; + } + else if (*c == ':' && *(c+1) == '/' && *(c+2) == '/') + { + + *c = '\0'; + if (strcmp(g_options.auth_uri, "ldap") == 0 || strcmp(g_options.auth_uri, "ldaps") == 0) + { + *c = ':'; // LDAP URI's require the prodocol as part of the string + g_options.auth_method = AUTH_LDAP; + } + else if (strcmp(g_options.auth_uri, "mysql") == 0) + { + g_options.auth_uri = c+3; // MySQL doesn't (just a hostname) + g_options.auth_method = AUTH_MYSQL; + } + else + { + Fatal("Unsupported authentication method %s", g_options.auth_uri); + } + } + } + else + { + Log(LOGWARN, "No authentication method."); } + + Log(LOGDEBUG, "Verbosity: %d", g_options.verbosity); + Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin); + Log(LOGDEBUG, "Auth method: %d", g_options.auth_method); + Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri); + Log(LOGDEBUG, "Auth Options: %s", g_options.auth_options); + //Log(LOGDEBUG, "Root directory: %s", g_options.root_dir); + Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir); + + } @@ -109,10 +160,42 @@ void Cleanup() { Log(LOGDEBUG, "Begin cleanup."); Sensor_Cleanup(); - //Actuator_Cleanup(); + Actuator_Cleanup(); Log(LOGDEBUG, "Finish cleanup."); } + +#ifdef REALTIME_VERSION + +#define MAX_SAFE_STACK (8*1024) +#define NSEC_PER_SEC (1000000000) + +void stack_prefault() +{ + unsigned char dummy[MAX_SAFE_STACK]; + memset(dummy, 0, MAX_SAFE_STACK); + return; +} + +bool is_realtime() +{ + struct utsname u; + bool crit1 = 0; + bool crit2 = 0; + FILE * f; + uname(&u); + crit1 = (strcasestr(u.version, "PREEMPT RT") != NULL); + if (crit1 && ((f = fopen("/sys/kernel/realtime", "r")) != NULL)) + { + int flag; + crit2 = ((fscanf(f, "%d", &flag) == 1) && (flag == 1)); + fclose(f); + } + return (crit1 && crit2); +} + +#endif //REALTIME_VERSION + /** * Main entry point; start worker threads, setup signal handling, wait for threads to exit, exit * @param argc - Num args @@ -122,30 +205,54 @@ void Cleanup() */ int main(int argc, char ** argv) { + // Open log before calling ParseArguments (since ParseArguments may call the Log functions) openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER); - Log(LOGINFO, "Server started"); ParseArguments(argc, argv); // Setup the g_options structure from program arguments - Sensor_Init(); - Actuator_Init(); + Log(LOGINFO, "Server started"); + + + + #ifdef REALTIME_VERSION + + if (is_realtime()) + { + Log(LOGDEBUG, "Running under realtime kernel"); + } + else + { + Fatal("Not running under realtime kernel"); + } + struct sched_param param; + param.sched_priority = 49; + if (sched_setscheduler(0, SCHED_FIFO, ¶m) < 0) + Fatal("sched_setscheduler failed - %s", strerror(errno)); + if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) + Fatal("mlockall failed - %s", strerror(errno)); + stack_prefault(); + #endif //REALTIME_VERSION + + + Pin_Init(); // Try and start things - /* - const char *ret; - if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL) - Fatal("Control_SetMode failed with '%s'", ret); - */ + + //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); - */ + + Control_SetMode(CONTROL_STOP, NULL); + //if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL) + // Fatal("Control_SetMode failed with '%s'", ret); + //Sensor_StopAll(); //Actuator_StopAll();