X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fcontrol.c;h=6ebaba7fd6843bc1337343a715440b873d01fae7;hb=544b54c409f3731b8e1581af95072a64ff393a28;hp=4342c8ccf5cf78331167c1c5883fca4a14c9cef1;hpb=cf4f872e4a4d739408bd2f0d71887d27ebe598c9;p=matches%2FMCTX3420.git diff --git a/server/control.c b/server/control.c index 4342c8c..6ebaba7 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]; @@ -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; }