Changes in uspace/app/bnchmark/bnchmark.c [205f1add:1433ecda] in mainline

File:

• uspace/app/bnchmark/bnchmark.c (modified) (4 diffs)

uspace/app/bnchmark/bnchmark.c

@@ -56 +56 @@
 
 typedef errno_t (*measure_func_t)(void *);
+typedef unsigned long umseconds_t; /* milliseconds */
 
 static void syntax_print(void);
 
-static errno_t measure(measure_func_t fn, void *data, msec_t *result)
-{
-        struct timespec start_time;
-        getuptime(&start_time);
+static errno_t measure(measure_func_t fn, void *data, umseconds_t *result)
+{
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
 
         errno_t rc = fn(data);
@@ -70 +71 @@
         }
 
-        struct timespec final_time;
-        getuptime(&final_time);
+        struct timeval final_time;
+        gettimeofday(&final_time, NULL);
 
         /* Calculate time difference in milliseconds */
-        *result = NSEC2USEC(ts_sub_diff(&final_time, &start_time));
+        *result = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
+            ((final_time.tv_sec - start_time.tv_sec) * 1000);
         return EOK;
 }
@@ -131 +133 @@
 {
         errno_t rc;
-        msec_t milliseconds_taken = 0;
+        umseconds_t milliseconds_taken = 0;
         char *path = NULL;
         measure_func_t fn = NULL;
@@ -192 +194 @@
                 }
 
-                printf("%s;%s;%s;%lld;ms\n", test_type, path, log_str, milliseconds_taken);
+                printf("%s;%s;%s;%lu;ms\n", test_type, path, log_str, milliseconds_taken);
         }