Changeset d37dd3b9 in mainline

Timestamp:

2017-12-21T09:37:58Z (7 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

0fbe27d

Parents:

ad2a8b1

Message:

tmon: more refactoring, removed some duplicate code, included resolving files, printing more error messages

Location:

uspace/app/tmon

Files:

• resolve.c (added)
• resolve.h (added)
• test.c (modified) (3 diffs)

uspace/app/tmon/test.c

@@ -48 +48 @@
 #define DEFAULT_SIZE    65432
 
-static int resolve_and_test(int argc, char *argv[], int (*test)(devman_handle_t, int, size_t)) {
+static int resolve_and_test(int argc, char *argv[], int (*test)(async_exch_t *, int, size_t)) {
         devman_handle_t fun = -1;
 
@@ -62 +62 @@
         }
 
-        int rc;
+        int rc, ec;
         char path[MAX_PATH_LENGTH];
         if ((rc = devman_fun_get_path(fun, path, sizeof(path)))) {
@@ -73 +73 @@
         // 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;
+        if (!sess) {
+                printf(NAME ": Could not connect to the device.\n");
+                return 1;
         }
 
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (!exch) {
+                printf(NAME ": Could not start exchange with the device.\n");
+                ec = 1;
+                goto err_sess;
+        }
+
+        ec = test(exch, DEFAULT_CYCLES, DEFAULT_SIZE);
         async_exchange_end(exch);
+
+err_sess:
         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;
-
+static int stress_intr_in(async_exch_t *exch, int cycles, size_t size)
+{
+        int rc = usbdiag_stress_intr_in(exch, cycles, size);
         if (rc) {
                 printf(NAME ": %s\n", str_error(rc));
-                ec = 1;
+                return 1;
         }
 
-        async_exchange_end(exch);
-        usbdiag_disconnect(sess);
-        return ec;
+        return 0;
 }
 
-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);
-        int ec = 0;
-
+static int stress_intr_out(async_exch_t *exch, int cycles, size_t size)
+{
+        int rc = usbdiag_stress_intr_out(exch, cycles, size);
         if (rc) {
                 printf(NAME ": %s\n", str_error(rc));
-                ec = 1;
+                return 1;
         }
 
-        async_exchange_end(exch);
-        usbdiag_disconnect(sess);
-        return ec;
+        return 0;
 }
 
-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);
-        int ec = 0;
-
+static int stress_bulk_in(async_exch_t *exch, int cycles, size_t size)
+{
+        int rc = usbdiag_stress_bulk_in(exch, cycles, size);
         if (rc) {
                 printf(NAME ": %s\n", str_error(rc));
-                ec = 1;
+                return 1;
         }
 
-        async_exchange_end(exch);
-        usbdiag_disconnect(sess);
-        return ec;
+        return 0;
+}
+
+static int stress_bulk_out(async_exch_t *exch, int cycles, size_t size)
+{
+        int rc = usbdiag_stress_bulk_out(exch, cycles, size);
+        if (rc) {
+                printf(NAME ": %s\n", str_error(rc));
+                return 1;
+        }
+
+        return 0;
 }