X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=693528fe1954c1398cd6967b50be061caa9948c5;hb=51862bb98c26e9b3f03d46ae0f8ceb434f0743d0;hp=5109617837f94ae9402f7c9b6bcef43fca983018;hpb=526fe3d83e118d87af34353a7140c02f3f1a3c19;p=openocd.git

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 5109617837..693528fe19 100644
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -2,9 +2,12 @@
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   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,15 +27,8 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
 #include "time_support.h"
-#include "log.h"
-
-#include <stdlib.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)
@@ -59,68 +55,56 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *
 /* add two struct timeval values */
 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;
+	memcpy(result, x, sizeof(struct timeval));
+	return timeval_add_time(result, y->tv_sec, y->tv_usec);
 }
 
-int timeval_add_time(struct timeval *result, int sec, int usec)
+int timeval_add_time(struct timeval *result, long sec, long 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)
+int64_t timeval_ms()
 {
-	gettimeofday(&duration->start, NULL);
-	
-	return ERROR_OK;
+	struct timeval now;
+	int retval = gettimeofday(&now, NULL);
+	if (retval < 0)
+		return retval;
+	return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000;
 }
 
-int duration_stop_measure(duration_t *duration, char **text)
+
+int duration_start(struct duration *duration)
+{
+	return gettimeofday(&duration->start, NULL);
+}
+
+int duration_measure(struct duration *duration)
 {
 	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;
+	int retval = gettimeofday(&end, NULL);
+	if (0 == retval)
+		timeval_subtract(&duration->elapsed, &end, &duration->start);
+	return retval;
 }
 
-long long timeval_ms()
+float duration_elapsed(struct duration *duration)
 {
-	struct timeval now; 
-	long long t=0;
-	gettimeofday(&now, NULL);
-	
-	t+=now.tv_usec/1000;
-	t+=now.tv_sec*1000;
-	
+	float t = duration->elapsed.tv_sec;
+	t += (float)duration->elapsed.tv_usec / 1000000.0;
 	return t;
 }
+
+float duration_kbps(struct duration *duration, size_t count)
+{
+	return count / (1024.0 * duration_elapsed(duration));
+}