Changeset 96c416a in mainline

Timestamp:

2017-12-22T12:19:02Z (6 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

b10a434

Parents:

b7b7898

Message:

usbdiag: measure test duration

File:

• uspace/drv/bus/usb/usbdiag/tests.c (modified) (12 diffs)

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

@@ -37 +37 @@
 #include <str_error.h>
 #include <usb/debug.h>
+#include <time.h>
 #include "device.h"
 #include "tests.h"
@@ -42 +43 @@
 #define NAME "usbdiag"
 
-static int burst_in_test(usb_pipe_t *pipe, int cycles, size_t size)
+static int burst_in_test(usb_pipe_t *pipe, int cycles, size_t size, unsigned long *duration)
 {
         if (!pipe)
@@ -54 +55 @@
 
         usb_log_info("Performing %s IN burst test.", usb_str_transfer_type(pipe->desc.transfer_type));
+
         int rc = EOK;
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
+
         for (int i = 0; i < cycles; ++i) {
                 // Read device's response.
@@ -78 +83 @@
                         break;
         }
-        usb_log_info("Burst test on %s IN endpoint completed.", usb_str_transfer_type(pipe->desc.transfer_type));
+
+        struct timeval final_time;
+        gettimeofday(&final_time, NULL);
+        unsigned long in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
+            ((final_time.tv_sec - start_time.tv_sec) * 1000);
+
+        usb_log_info("Burst test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
         free(buffer);
+        if (duration)
+                *duration = in_duration;
+
         return rc;
 }
 
-static int burst_out_test(usb_pipe_t *pipe, int cycles, size_t size)
+static int burst_out_test(usb_pipe_t *pipe, int cycles, size_t size, unsigned long *duration)
 {
         if (!pipe)
@@ -98 +112 @@
 
         usb_log_info("Performing %s OUT burst test.", usb_str_transfer_type(pipe->desc.transfer_type));
+
         int rc = EOK;
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
+
         for (int i = 0; i < cycles; ++i) {
                 // Write buffer to device.
@@ -106 +124 @@
                 }
         }
-        usb_log_info("Burst test on %s OUT endpoint completed.", usb_str_transfer_type(pipe->desc.transfer_type));
+
+        struct timeval final_time;
+        gettimeofday(&final_time, NULL);
+        unsigned long in_duration = ((final_time.tv_usec - start_time.tv_usec) / 1000) +
+            ((final_time.tv_sec - start_time.tv_sec) * 1000);
+
+        usb_log_info("Burst test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
         free(buffer);
+        if (duration)
+                *duration = in_duration;
+
         return rc;
 }
@@ -118 +145 @@
                 return EBADMEM;
 
-        return burst_in_test(dev->intr_in, cycles, size);
+        // FIXME: report duration
+        return burst_in_test(dev->intr_in, cycles, size, NULL);
 }
 
@@ -127 +155 @@
                 return EBADMEM;
 
-        return burst_out_test(dev->intr_out, cycles, size);
+        // FIXME: report duration
+        return burst_out_test(dev->intr_out, cycles, size, NULL);
 }
 
@@ -136 +165 @@
                 return EBADMEM;
 
-        return burst_in_test(dev->bulk_in, cycles, size);
+        // FIXME: report duration
+        return burst_in_test(dev->bulk_in, cycles, size, NULL);
 }
 
@@ -145 +175 @@
                 return EBADMEM;
 
-        return burst_out_test(dev->bulk_out, cycles, size);
+        // FIXME: report duration
+        return burst_out_test(dev->bulk_out, cycles, size, NULL);
 }
 
@@ -154 +185 @@
                 return EBADMEM;
 
-        return burst_in_test(dev->isoch_in, cycles, size);
+        // FIXME: report duration
+        return burst_in_test(dev->isoch_in, cycles, size, NULL);
 }
 
@@ -163 +195 @@
                 return EBADMEM;
 
-        return burst_out_test(dev->isoch_out, cycles, size);
+        // FIXME: report duration
+        return burst_out_test(dev->isoch_out, cycles, size, NULL);
 }