Changeset fd312d5 in mainline for uspace/app

Timestamp:

2017-12-20T16:06:56Z (8 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

cec130b

Parents:

f98f4b7

Message:

usbdiag: more robust testing framework, added bulk in stress test, refactored remote usbdiag interface, new command for tmon

Location:

uspace/app/tmon

Files:

• commands.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• test.c (modified) (2 diffs)

uspace/app/tmon/commands.h

@@ -38 +38 @@
 
 int tmon_list(int, char **);
-int tmon_test_bulk(int, char **);
+int tmon_stress_bulk_in(int, char **);
+int tmon_stress_bulk_out(int, char **);
 
 #endif /* TMON_COMMANDS_H_ */

uspace/app/tmon/main.c

@@ -40 +40 @@
 #define NAME "tmon"
 
-static int fallback(int argc, char *argv[])
-{
-        // FIXME
-        printf(NAME ": Not implemented, lol!\n");
-        return 1;
-}
-
 typedef struct {
         const char *name;
@@ -60 +53 @@
         },
         {
-                .name = "test-bulk",
-                .description = "Benchmark bulk endpoints of a diagnostic device.",
-                .action = tmon_test_bulk,
+                .name = "stress-bulk-in",
+                .description = "Stress benchmark bulk in endpoints of a diagnostic device.",
+                .action = tmon_stress_bulk_in,
         },
         {
-                .name = "test-intr",
-                .description = "Benchmark interrupt endpoints of a diagnostic device.",
-                .action = fallback,
-        },
-        {
-                .name = "test-isoch",
-                .description = "Benchmark isochronous endpoints of a diagnostic device.",
-                .action = fallback,
+                .name = "stress-bulk-out",
+                .description = "Benchmark bulk out endpoints of a diagnostic device.",
+                .action = tmon_stress_bulk_out,
         },
         {

uspace/app/tmon/test.c

@@ -114 +114 @@
 }
 
-static int bulk_worker(devman_handle_t fun) {
+static int stress_bulk_in(devman_handle_t fun) {
         async_sess_t *sess = usbdiag_connect(fun);
         async_exch_t *exch = async_exchange_begin(sess);
 
-        // TODO: do some testing
-        int y;
-        int rc = usbdiag_test(exch, 4200, &y);
+        const int cycles = 1024;
+        const size_t size = 65432;
+        int rc = usbdiag_stress_bulk_in(exch, cycles, size);
 
         if (rc) {
                 printf(NAME ": %s\n", str_error(rc));
-        } else {
-                printf("The number is %d.\n", y);
         }
 
@@ -133 +131 @@
 }
 
-int tmon_test_bulk(int argc, char *argv[])
+static int stress_bulk_out(devman_handle_t fun) {
+        async_sess_t *sess = usbdiag_connect(fun);
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        const int cycles = 1024;
+        const size_t size = 65432;
+        int rc = usbdiag_stress_bulk_out(exch, cycles, size);
+
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+        }
+
+        async_exchange_end(exch);
+        usbdiag_disconnect(sess);
+        return 0;
+}
+
+int tmon_stress_bulk_in(int argc, char *argv[])
 {
-        return resolve_and_test(argc, argv, bulk_worker);
+        return resolve_and_test(argc, argv, stress_bulk_in);
+}
+
+int tmon_stress_bulk_out(int argc, char *argv[])
+{
+        return resolve_and_test(argc, argv, stress_bulk_out);
 }