X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=bc23cb08bed6b348a535284a6faa25fc00b494df;hb=1793150091a813e5de4552fc17dd5baf1a474829;hp=fffc53797c4a1a2babbf7515c71d4fb0efc39d28;hpb=cb582796539d35920e918bec2d0118eb3736d40e;p=openocd

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index fffc5379..bc23cb08 100644
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -2,6 +2,12 @@
  *   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     *
@@ -24,12 +30,6 @@
 #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)
@@ -57,15 +57,15 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *
 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;
 }
 
@@ -73,36 +73,49 @@ int timeval_add_time(struct timeval *result, int sec, int usec)
 {
 	result->tv_sec += sec;
 	result->tv_usec += usec;
-	
+
 	while (result->tv_usec > 1000000)
 	{
 		result->tv_usec -= 1000000;
 		result->tv_sec++;
 	}
-	
+
 	return 0;
 }
 
-int duration_start_measure(duration_t *duration)
+void duration_start_measure(duration_t *duration)
 {
 	gettimeofday(&duration->start, NULL);
-	
-	return ERROR_OK;
 }
 
 int duration_stop_measure(duration_t *duration, char **text)
 {
 	struct timeval end;
-	
+
 	gettimeofday(&end, NULL);
-	
+
 	timeval_subtract(&duration->duration, &end, &duration->start);
-	
+
 	if (text)
 	{
-		*text = malloc(16);
-		snprintf(*text, 16, "%is %ius", duration->duration.tv_sec, duration->duration.tv_usec);
+		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;
+}