X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=922d411d7561f8671645c3310468f105da953133;hp=620c9c488e675dfdf2f46a0d30539197f00475c6;hb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 620c9c488e..922d411d75 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     *
@@ -22,13 +28,8 @@
 #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)
@@ -82,3 +83,39 @@ int timeval_add_time(struct timeval *result, int sec, int usec)
 	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;
+}