X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fcontrol.c;h=f81ea00b9c79cc171896e58caa6aa996527e724c;hb=75b9743b95672218a61811b03433c0ab6e00ec5c;hp=4342c8ccf5cf78331167c1c5883fca4a14c9cef1;hpb=cf4f872e4a4d739408bd2f0d71887d27ebe598c9;p=matches%2FMCTX3420.git

diff --git a/server/control.c b/server/control.c
index 4342c8c..f81ea00 100644
--- a/server/control.c
+++ b/server/control.c
@@ -14,7 +14,7 @@
 typedef struct ControlData {
 	ControlModes current_mode;
 	pthread_mutex_t mutex;
-	struct timeval start_time;
+	struct timespec start_time;
 	char user_name[31]; // The user who owns the currently running experiment
 	char experiment_dir[BUFSIZ]; //Directory for experiment
 	char experiment_name[BUFSIZ];
@@ -197,7 +197,7 @@ void Control_Handler(FCGIContext *context, char *params) {
 						"%s", name);
 		}
 
-		FCGI_AcceptJSON(context, "Ok", NULL);
+		FCGI_AcceptJSON(context, "Ok");
 	}
 }
 
@@ -225,7 +225,7 @@ const char* Control_SetMode(ControlModes desired_mode, void * arg)
 						path, strerror(errno));
 					ret = "Couldn't create experiment directory.";
 				} else {
-					gettimeofday(&(g_controls.start_time), NULL);
+					clock_gettime(CLOCK_MONOTONIC, &(g_controls.start_time));
 				}
 			} else 
 				ret = "Cannot start when not in a stopped state.";
@@ -280,6 +280,6 @@ const char * Control_GetModeName() {
  * Gets the start time for the current experiment
  * @return the start time
  */
-const struct timeval* Control_GetStartTime() {
+const struct timespec * Control_GetStartTime() {
 	return &g_controls.start_time;
 }