* Copyright (C) 2006 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
+ * *
+ * Copyright (C) 2008 by Spencer Oliver *
+ * spen@spen-soft.co.uk *
+ * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include "time_support.h"
+#include "log.h"
-#include <sys/time.h>
-#include <time.h>
-
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add_time(struct timeval *result, int sec, int usec);
/* calculate difference between two struct timeval values */
int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y)
{
result->tv_sec = x->tv_sec + y->tv_sec;
-
+
result->tv_usec = x->tv_usec + y->tv_usec;
-
+
while (result->tv_usec > 1000000)
{
result->tv_usec -= 1000000;
result->tv_sec++;
}
-
+
return 0;
}
{
result->tv_sec += sec;
result->tv_usec += usec;
-
+
while (result->tv_usec > 1000000)
{
result->tv_usec -= 1000000;
result->tv_sec++;
}
-
+
return 0;
}
+void duration_start_measure(duration_t *duration)
+{
+ gettimeofday(&duration->start, NULL);
+}
+
+int duration_stop_measure(duration_t *duration, char **text)
+{
+ struct timeval end;
+
+ gettimeofday(&end, NULL);
+
+ timeval_subtract(&duration->duration, &end, &duration->start);
+
+ if (text)
+ {
+ float t;
+ t = duration->duration.tv_sec;
+ t += (float)duration->duration.tv_usec/1000000.0;
+ *text = malloc(100);
+ snprintf(*text, 100, "%fs", t);
+ }
+
+ return ERROR_OK;
+}
+
+long long timeval_ms()
+{
+ struct timeval now;
+ long long t = 0;
+ gettimeofday(&now, NULL);
+
+ t += now.tv_usec/1000;
+ t += now.tv_sec*1000;
+
+ return t;
+}