Changeset bd41ac52 in mainline for uspace/drv/bus/usb/usbdiag/tests.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/drv/bus/usb/usbdiag/tests.c (modified) (4 diffs)

uspace/drv/bus/usb/usbdiag/tests.c

@@ -72 +72 @@
         uint32_t transfer_count = 0;
 
-        struct timeval start_time, final_time, stop_time;
-        gettimeofday(&start_time, NULL);
-        gettimeofday(&stop_time, NULL);
-
-        tv_add_diff(&stop_time, params->min_duration * 1000);
-        gettimeofday(&final_time, NULL);
-
-        while (!tv_gt(&final_time, &stop_time)) {
+        struct timespec start_time, final_time, stop_time;
+        getuptime(&start_time);
+        getuptime(&stop_time);
+
+        ts_add_diff(&stop_time, MSEC2NSEC(params->min_duration));
+        getuptime(&final_time);
+
+        while (!ts_gt(&final_time, &stop_time)) {
                 ++transfer_count;
 
@@ -121 +121 @@
                 }
 
-                gettimeofday(&final_time, NULL);
-        }
-
-        usbdiag_dur_t in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
-            ((final_time.tv_sec - start_time.tv_sec) * 1000);
+                getuptime(&final_time);
+        }
+
+        usbdiag_dur_t in_duration = NSEC2MSEC(final_time.tv_nsec - start_time.tv_nsec) +
+            SEC2MSEC(final_time.tv_sec - start_time.tv_sec);
 
         usb_log_info("Test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
@@ -170 +170 @@
         uint32_t transfer_count = 0;
 
-        struct timeval start_time, final_time, stop_time;
-        gettimeofday(&start_time, NULL);
-        gettimeofday(&stop_time, NULL);
-
-        tv_add_diff(&stop_time, params->min_duration * 1000);
-        gettimeofday(&final_time, NULL);
-
-        while (!tv_gt(&final_time, &stop_time)) {
+        struct timespec start_time, final_time, stop_time;
+        getuptime(&start_time);
+        getuptime(&stop_time);
+
+        ts_add_diff(&stop_time, MSEC2NSEC(params->min_duration));
+        getuptime(&final_time);
+
+        while (!ts_gt(&final_time, &stop_time)) {
                 ++transfer_count;
 
@@ -186 +186 @@
                 }
 
-                gettimeofday(&final_time, NULL);
-        }
-
-        usbdiag_dur_t in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
-            ((final_time.tv_sec - start_time.tv_sec) * 1000);
+                getuptime(&final_time);
+        }
+
+        usbdiag_dur_t in_duration = NSEC2MSEC(final_time.tv_nsec - start_time.tv_nsec) +
+            SEC2MSEC(final_time.tv_sec - start_time.tv_sec);
 
         usb_log_info("Test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);