Changeset e9d600c2 in mainline for uspace/app/tmon/test.c

Timestamp:

2017-12-21T09:03:55Z (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:

ad2a8b1

Parents:

cec130b

Message:

usbdiag: added interrupt endpoint tests, printing tmon device path

File:

• uspace/app/tmon/test.c (modified) (3 diffs)

uspace/app/tmon/test.c

@@ -44 +44 @@
 
 #define NAME "tmon"
+#define MAX_PATH_LENGTH 1024
+
+#define DEFAULT_CYCLES  1024
+#define DEFAULT_SIZE    65432
 
 static int resolve_default_fun(devman_handle_t *fun)
@@ -97 +101 @@
 }
 
-static int resolve_and_test(int argc, char *argv[], int (*test)(devman_handle_t)) {
+static int resolve_and_test(int argc, char *argv[], int (*test)(devman_handle_t, int, size_t)) {
         devman_handle_t fun = -1;
 
@@ -111 +115 @@
         }
 
-        return test(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);
-
-        const int cycles = 1024;
-        const size_t size = 65432;
+        int rc;
+        char path[MAX_PATH_LENGTH];
+        if ((rc = devman_fun_get_path(fun, path, sizeof(path)))) {
+                printf(NAME ": Error resolving path of device with handle %ld. %s\n", fun, str_error(rc));
+                return 1;
+        }
+
+        printf("Using device: %s\n", path);
+
+        // TODO: Read options here.
+
+        return test(fun, DEFAULT_CYCLES, DEFAULT_SIZE);
+}
+
+static int stress_intr_in(devman_handle_t fun, int cycles, size_t size) {
+        async_sess_t *sess = usbdiag_connect(fun);
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        int rc = usbdiag_stress_intr_in(exch, cycles, size);
+        int ec = 0;
+
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+                ec = 1;
+        }
+
+        async_exchange_end(exch);
+        usbdiag_disconnect(sess);
+        return ec;
+}
+
+static int stress_intr_out(devman_handle_t fun, int cycles, size_t size) {
+        async_sess_t *sess = usbdiag_connect(fun);
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        int rc = usbdiag_stress_intr_out(exch, cycles, size);
+        int ec = 0;
+
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+                ec = 1;
+        }
+
+        async_exchange_end(exch);
+        usbdiag_disconnect(sess);
+        return ec;
+}
+
+static int stress_bulk_in(devman_handle_t fun, int cycles, size_t size) {
+        async_sess_t *sess = usbdiag_connect(fun);
+        async_exch_t *exch = async_exchange_begin(sess);
+
         int rc = usbdiag_stress_bulk_in(exch, cycles, size);
-
-        if (rc) {
-                printf(NAME ": %s\n", str_error(rc));
-        }
-
-        async_exchange_end(exch);
-        usbdiag_disconnect(sess);
-        return 0;
-}
-
-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 ec = 0;
+
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+                ec = 1;
+        }
+
+        async_exchange_end(exch);
+        usbdiag_disconnect(sess);
+        return ec;
+}
+
+static int stress_bulk_out(devman_handle_t fun, int cycles, size_t size) {
+        async_sess_t *sess = usbdiag_connect(fun);
+        async_exch_t *exch = async_exchange_begin(sess);
+
         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 ec = 0;
+
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+                ec = 1;
+        }
+
+        async_exchange_end(exch);
+        usbdiag_disconnect(sess);
+        return ec;
+}
+
+int tmon_stress_intr_in(int argc, char *argv[])
+{
+        return resolve_and_test(argc, argv, stress_intr_in);
+}
+
+int tmon_stress_intr_out(int argc, char *argv[])
+{
+        return resolve_and_test(argc, argv, stress_intr_out);
 }