Changeset 3b5a5e3 in mainline

Timestamp:

2018-02-01T16:10:12Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

3038d51

Parents:

8393c73b

git-author:

Petr Manek <petr.manek@…> (2018-02-01 16:09:43)

git-committer:

Petr Manek <petr.manek@…> (2018-02-01 16:10:12)

Message:

tmon: catch up with libdrv changes, simplify code

Location:

uspace/app/tmon

Files:

• Makefile (modified) (2 diffs)
• burst_tests.c (deleted)
• commands.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• tests.c (added)
• tf.c (modified) (3 diffs)
• tf.h (modified) (1 diff)

uspace/app/tmon/Makefile

@@ -30 +30 @@
 BINARY = tmon
 
-LIBS = drv
+LIBS = drv usb
 
 SOURCES = \
@@ -36 +36 @@
         list.c\
         tf.c\
-        burst_tests.c\
+        tests.c\
         resolve.c
 

uspace/app/tmon/commands.h

@@ -42 +42 @@
 int tmon_list(int, char **);
 
-/* Burst tests read/write into endpoints as fast as possible. */
-int tmon_burst_intr_in(int, char **);
-int tmon_burst_intr_out(int, char **);
-int tmon_burst_bulk_in(int, char **);
-int tmon_burst_bulk_out(int, char **);
-int tmon_burst_isoch_in(int, char **);
-int tmon_burst_isoch_out(int, char **);
+/* Tests commands differ by endpoint types. */
+int tmon_test_intr_in(int, char **);
+int tmon_test_intr_out(int, char **);
+int tmon_test_bulk_in(int, char **);
+int tmon_test_bulk_out(int, char **);
+int tmon_test_isoch_in(int, char **);
+int tmon_test_isoch_out(int, char **);
 
 #endif /* TMON_COMMANDS_H_ */

uspace/app/tmon/main.c

@@ -62 +62 @@
                 .name = "test-intr-in",
                 .description = "Read from interrupt endpoint as fast as possible.",
-                .action = tmon_burst_intr_in,
+                .action = tmon_test_intr_in,
         },
         {
                 .name = "test-intr-out",
                 .description = "Write to interrupt endpoint as fast as possible.",
-                .action = tmon_burst_intr_out,
+                .action = tmon_test_intr_out,
         },
         {
                 .name = "test-bulk-in",
                 .description = "Read from bulk endpoint as fast as possible.",
-                .action = tmon_burst_bulk_in,
+                .action = tmon_test_bulk_in,
         },
         {
                 .name = "test-bulk-out",
                 .description = "Write to bulk endpoint as fast as possible.",
-                .action = tmon_burst_bulk_out,
+                .action = tmon_test_bulk_out,
         },
         {
                 .name = "test-isoch-in",
                 .description = "Read from isochronous endpoint as fast as possible.",
-                .action = tmon_burst_isoch_in,
+                .action = tmon_test_isoch_in,
         },
         {
                 .name = "test-isoch-out",
                 .description = "Write to isochronous endpoint as fast as possible.",
-                .action = tmon_burst_isoch_out,
-        }
+                .action = tmon_test_isoch_out,
+        },
 };
 
@@ -104 +104 @@
 static tmon_opt_t options[] = {
         {
-                .long_name = "cycles",
-                .short_name = 'n',
-                .description = "Set the number of read/write cycles."
+                .long_name = "duration",
+                .short_name = 't',
+                .description = "Set the minimum test duration (in seconds)."
         },
         {
                 .long_name = "size",
                 .short_name = 's',
-                .description = "Set the data size transferred in a single cycle."
-        }
+                .description = "Set the data size (in bytes) transferred in a single cycle."
+        },
+        {
+                .long_name = "validate",
+                .short_name = 'v',
+                .description = "Validate the correctness of transferred data (impacts performance)."
+        },
 };
 

uspace/app/tmon/tf.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <macros.h>
 #include <devman.h>
 #include <str_error.h>
@@ -74 +75 @@
         }
 
-        printf("Using device: %s\n", path);
+        printf("Device: %s\n", path);
 
         // Read test parameters from options.
-        tmon_test_params_t *params = NULL;
+        void *params = NULL;
         if ((rc = ops->read_params(argc, argv, &params))) {
                 printf(NAME ": Reading test parameters failed. %s\n", str_error(rc));
+                return 1;
+        }
+
+        if ((rc = ops->pre_run(params))) {
+                printf(NAME ": Pre-run hook failed. %s\n", str_error(rc));
                 return 1;
         }
@@ -106 +112 @@
 }
 
+/** Unit of quantity used for pretty formatting. */
+typedef struct tmon_unit {
+        /** Prefix letter, which is printed before the actual unit. */
+        const char *unit;
+        /** Factor of the unit. */
+        double factor;
+} tmon_unit_t;
+
+/** Format a value for human reading.
+ * @param[in] val The value to format.
+ * @param[in] fmt Format string. Must include one double and char.
+ *
+ * @return Heap-allocated string if successful (caller becomes its owner), NULL otherwise.
+ */
+static char *format_unit(double val, const char *fmt, const tmon_unit_t *units, size_t len)
+{
+        // Figure out the "tightest" unit.
+        unsigned i;
+        for (i = 0; i < len; ++i) {
+                if (units[i].factor <= val)
+                        break;
+        }
+
+        if (i == len) --i;
+        const char *unit = units[i].unit;
+        double factor = units[i].factor;
+
+        // Format the size.
+        const double div_size = val / factor;
+
+        char *out = NULL;
+        asprintf(&out, fmt, div_size, unit);
+
+        return out;
+}
+
+/** Static array of size units with decreasing factors. */
+static const tmon_unit_t size_units[] = {
+        { .unit = "EB", .factor = 1ULL << 60 },
+        { .unit = "PB", .factor = 1ULL << 50 },
+        { .unit = "TB", .factor = 1ULL << 40 },
+        { .unit = "GB", .factor = 1ULL << 30 },
+        { .unit = "MB", .factor = 1ULL << 20 },
+        { .unit = "kB", .factor = 1ULL << 10 },
+        { .unit = "B",  .factor = 1ULL },
+};
+
+char *tmon_format_size(double val, const char *fmt)
+{
+        return format_unit(val, fmt, size_units, ARRAY_SIZE(size_units));
+}
+
+/** Static array of duration units with decreasing factors. */
+static const tmon_unit_t dur_units[] = {
+        { .unit = "d",   .factor = 60 * 60 * 24 },
+        { .unit = "h",   .factor = 60 * 60 },
+        { .unit = "min", .factor = 60 },
+        { .unit = "s",   .factor = 1 },
+        { .unit = "ms",  .factor = 1e-3 },
+        { .unit = "us",  .factor = 1e-6 },
+        { .unit = "ns",  .factor = 1e-9 },
+        { .unit = "ps",  .factor = 1e-12 },
+};
+
+char *tmon_format_duration(usbdiag_dur_t val, const char *fmt)
+{
+        return format_unit(val / 1000.0, fmt, dur_units, ARRAY_SIZE(dur_units));
+}
+
 /** @}
  */

uspace/app/tmon/tf.h

@@ -38 +38 @@
 
 #include <async.h>
-
-/** Parameters common for all tests. */
-typedef struct tmon_test_params {
-        /* Nothing here. */
-} tmon_test_params_t;
+#include <usbdiag_iface.h>
 
 /** Operations to implement by all tests. */
 typedef struct tmon_test_ops {
-        int (*run)(async_exch_t *, const tmon_test_params_t *);
-        int (*read_params)(int, char **, tmon_test_params_t **);
+        int (*pre_run)(void *);
+        int (*run)(async_exch_t *, const void *);
+        int (*read_params)(int, char **, void **);
 } tmon_test_ops_t;
 
 int tmon_test_main(int, char **, const tmon_test_ops_t *);
+
+char *tmon_format_size(double, const char *);
+char *tmon_format_duration(usbdiag_dur_t, const char *);
 
 #endif /* TMON_TF_H_ */