command_handler: change 'cmd_ctx' to CMD_CTX

[fw/openocd] / src / helper / time_support.c

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 865f24564de4a70504b3185b97cf609a2b701967..693528fe1954c1398cd6967b50be061caa9948c5 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "time_support.h"
-#include "log.h"
 
 
 /* calculate difference between two struct timeval values */
@@ -56,20 +55,11 @@ 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;
@@ -83,39 +73,38 @@ int timeval_add_time(struct timeval *result, int sec, int usec)
        return 0;
 }
 
-void duration_start_measure(duration_t *duration)
+int64_t timeval_ms()
 {
-       gettimeofday(&duration->start, NULL);
+       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)
-{
-       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 duration_start(struct duration *duration)
+{
+       return gettimeofday(&duration->start, NULL);
 }
 
-long long timeval_ms()
+int duration_measure(struct duration *duration)
 {
-       struct timeval now;
-       long long t = 0;
-       gettimeofday(&now, NULL);
-
-       t += now.tv_usec/1000;
-       t += now.tv_sec*1000;
+       struct timeval end;
+       int retval = gettimeofday(&end, NULL);
+       if (0 == retval)
+               timeval_subtract(&duration->elapsed, &end, &duration->start);
+       return retval;
+}
 
+float duration_elapsed(struct duration *duration)
+{
+       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));
+}