- added test results for r592

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

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index fffc53797c4a1a2babbf7515c71d4fb0efc39d28..e97993be6a298d6db98b5f6c8634c3d1cb643c01 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -21,11 +21,11 @@
 #include "config.h"
 #endif
 
+#include "replacements.h"
 #include "time_support.h"
 #include "log.h"
 
-#include <sys/time.h>
-#include <time.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);
@@ -100,9 +100,27 @@ int duration_stop_measure(duration_t *duration, char **text)
        
        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;
+}