Changeset dd36558 in mainline

Timestamp:

2017-12-21T10:26:47Z (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:

5302493

Parents:

d0d8e59

git-author:

Petr Mánek <petr.manek@…> (2017-12-21 10:26:43)

git-committer:

Petr Mánek <petr.manek@…> (2017-12-21 10:26:47)

Message:

tmon: refactoring

Tests now live as descendants of a common interface, which allows them to read generic parameters and be executed on diagnostic devices. All tests have a common main function, which calls this interface, and poses as a command to the main function of the tmon utility. Stress tests have therefore been moved to a separate file.

Location:

uspace/app/tmon

Files:

• Makefile (modified) (1 diff)
• stress_test.c (added)
• test.c (modified) (4 diffs)
• test.h (added)

uspace/app/tmon/Makefile

@@ -36 +36 @@
         list.c\
         test.c\
+        stress_test.c\
         resolve.c
 

uspace/app/tmon/test.c

@@ -32 +32 @@
 /**
  * @file
- * USB transfer debugging.
+ * Testing framework.
  */
 
@@ -39 +39 @@
 #include <str_error.h>
 #include <usbdiag_iface.h>
-#include "commands.h"
 #include "resolve.h"
+#include "test.h"
 
 #define NAME "tmon"
 #define MAX_PATH_LENGTH 1024
 
-#define DEFAULT_CYCLES  1024
-#define DEFAULT_SIZE    65432
-
-static int resolve_and_test(int argc, char *argv[], int (*test)(async_exch_t *, int, size_t)) {
+int tmon_test_main(int argc, char *argv[], const tmon_test_ops_t *ops) {
         devman_handle_t fun = -1;
 
@@ -71 +68 @@
         printf("Using device: %s\n", path);
 
-        // TODO: Read options here.
+        tmon_test_params_t *params = NULL;
+        if ((rc = ops->read_params(argc, argv, &params))) {
+                printf(NAME ": Reading test parameters failed.\n");
+                return 1;
+        }
 
         async_sess_t *sess = usbdiag_connect(fun);
@@ -86 +87 @@
         }
 
-        ec = test(exch, DEFAULT_CYCLES, DEFAULT_SIZE);
+        ec = ops->run(exch, params);
         async_exchange_end(exch);
 
 err_sess:
         usbdiag_disconnect(sess);
+        free(params);
         return ec;
-}
-
-static int stress_intr_in(async_exch_t *exch, int cycles, size_t size)
-{
-        printf("Executing interrupt in stress test.\n"
-            "      Packet count: %d\n"
-            "      Packet size: %ld\n", cycles, size);
-
-        int rc = usbdiag_stress_intr_in(exch, cycles, size);
-        if (rc) {
-                printf(NAME ": %s\n", str_error(rc));
-                return 1;
-        }
-
-        return 0;
-}
-
-static int stress_intr_out(async_exch_t *exch, int cycles, size_t size)
-{
-        printf("Executing interrupt out stress test.\n"
-            "      Packet count: %d\n"
-            "      Packet size: %ld\n", cycles, size);
-
-        int rc = usbdiag_stress_intr_out(exch, cycles, size);
-        if (rc) {
-                printf(NAME ": %s\n", str_error(rc));
-                return 1;
-        }
-
-        return 0;
-}
-
-static int stress_bulk_in(async_exch_t *exch, int cycles, size_t size)
-{
-        printf("Executing bulk in stress test.\n"
-            "      Packet count: %d\n"
-            "      Packet size: %ld\n", cycles, size);
-
-        int rc = usbdiag_stress_bulk_in(exch, cycles, size);
-        if (rc) {
-                printf(NAME ": %s\n", str_error(rc));
-                return 1;
-        }
-
-        return 0;
-}
-
-static int stress_bulk_out(async_exch_t *exch, int cycles, size_t size)
-{
-        printf("Executing bulk out stress test.\n"
-            "      Packet count: %d\n"
-            "      Packet size: %ld\n", cycles, size);
-
-        int rc = usbdiag_stress_bulk_out(exch, cycles, size);
-        if (rc) {
-                printf(NAME ": %s\n", str_error(rc));
-                return 1;
-        }
-
-        return 0;
-}
-
-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);
-}
-
-int tmon_stress_bulk_in(int argc, char *argv[])
-{
-        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);
 }