Changeset bd41ac52 in mainline for uspace/app/bnchmark/bnchmark.c

Timestamp:

2018-08-25T22:21:25Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

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