Index: uspace/app/tmon/Makefile =================================================================== --- uspace/app/tmon/Makefile (revision d0d8e590c77980315607e5c4ef171b433405e547) +++ uspace/app/tmon/Makefile (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) @@ -36,4 +36,5 @@ list.c\ test.c\ + stress_test.c\ resolve.c Index: uspace/app/tmon/stress_test.c =================================================================== --- uspace/app/tmon/stress_test.c (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) +++ uspace/app/tmon/stress_test.c (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2017 Petr Manek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tmon + * @{ + */ +/** + * @file + * USB stress tests. + */ + +#include +#include +#include +#include +#include "commands.h" +#include "test.h" + +#define NAME "tmon" + +typedef struct tmon_stress_test_params { + tmon_test_params_t base; /* inheritance */ + int cycles; + size_t size; +} tmon_stress_test_params_t; + +static int read_params(int argc, char *argv[], tmon_test_params_t **params) +{ + tmon_stress_test_params_t *p = (tmon_stress_test_params_t *) malloc(sizeof(tmon_stress_test_params_t)); + if (!p) + return ENOMEM; + + // Default values. + p->cycles = 1024; + p->size = 65432; + + // TODO: Parse argc, argv here. + + *params = (tmon_test_params_t *) p; + return EOK; +} + +static int run_intr_in(async_exch_t *exch, const tmon_test_params_t *generic_params) +{ + const tmon_stress_test_params_t *params = (tmon_stress_test_params_t *) generic_params; + printf("Executing interrupt in stress test.\n" + " Packet count: %d\n" + " Packet size: %ld\n", params->cycles, params->size); + + int rc = usbdiag_stress_intr_in(exch, params->cycles, params->size); + if (rc) { + printf(NAME ": %s\n", str_error(rc)); + return 1; + } + + return 0; +} + +static int run_intr_out(async_exch_t *exch, const tmon_test_params_t *generic_params) +{ + const tmon_stress_test_params_t *params = (tmon_stress_test_params_t *) generic_params; + printf("Executing interrupt out stress test.\n" + " Packet count: %d\n" + " Packet size: %ld\n", params->cycles, params->size); + + int rc = usbdiag_stress_intr_out(exch, params->cycles, params->size); + if (rc) { + printf(NAME ": %s\n", str_error(rc)); + return 1; + } + + return 0; +} + +static int run_bulk_in(async_exch_t *exch, const tmon_test_params_t *generic_params) +{ + const tmon_stress_test_params_t *params = (tmon_stress_test_params_t *) generic_params; + printf("Executing bulk in stress test.\n" + " Packet count: %d\n" + " Packet size: %ld\n", params->cycles, params->size); + + int rc = usbdiag_stress_bulk_in(exch, params->cycles, params->size); + if (rc) { + printf(NAME ": %s\n", str_error(rc)); + return 1; + } + + return 0; +} + +static int run_bulk_out(async_exch_t *exch, const tmon_test_params_t *generic_params) +{ + const tmon_stress_test_params_t *params = (tmon_stress_test_params_t *) generic_params; + printf("Executing bulk out stress test.\n" + " Packet count: %d\n" + " Packet size: %ld\n", params->cycles, params->size); + + int rc = usbdiag_stress_bulk_out(exch, params->cycles, params->size); + if (rc) { + printf(NAME ": %s\n", str_error(rc)); + return 1; + } + + return 0; +} + +int tmon_stress_intr_in(int argc, char *argv[]) +{ + static const tmon_test_ops_t ops = { + .run = run_intr_in, + .read_params = read_params + }; + + return tmon_test_main(argc, argv, &ops); +} + +int tmon_stress_intr_out(int argc, char *argv[]) +{ + static const tmon_test_ops_t ops = { + .run = run_intr_out, + .read_params = read_params + }; + + return tmon_test_main(argc, argv, &ops); +} + +int tmon_stress_bulk_in(int argc, char *argv[]) +{ + static const tmon_test_ops_t ops = { + .run = run_bulk_in, + .read_params = read_params + }; + + return tmon_test_main(argc, argv, &ops); +} + +int tmon_stress_bulk_out(int argc, char *argv[]) +{ + static const tmon_test_ops_t ops = { + .run = run_bulk_out, + .read_params = read_params + }; + + return tmon_test_main(argc, argv, &ops); +} + +/** @} + */ Index: uspace/app/tmon/test.c =================================================================== --- uspace/app/tmon/test.c (revision d0d8e590c77980315607e5c4ef171b433405e547) +++ uspace/app/tmon/test.c (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) @@ -32,5 +32,5 @@ /** * @file - * USB transfer debugging. + * Testing framework. */ @@ -39,14 +39,11 @@ #include #include -#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,5 +68,9 @@ printf("Using device: %s\n", path); - // TODO: Read options here. + tmon_test_params_t *params = NULL; + if ((rc = ops->read_params(argc, argv, ¶ms))) { + printf(NAME ": Reading test parameters failed.\n"); + return 1; + } async_sess_t *sess = usbdiag_connect(fun); @@ -86,90 +87,11 @@ } - 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); } Index: uspace/app/tmon/test.h =================================================================== --- uspace/app/tmon/test.h (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) +++ uspace/app/tmon/test.h (revision dd365580de997ee59de1bc5fc4e79fc0c647b8b0) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2017 Petr Manek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tmon + * @{ + */ +/** + * @file Testing framework definitions. + */ + +#ifndef TMON_TEST_H_ +#define TMON_TEST_H_ + +#include + +/** Parameters common for all tests. */ +typedef struct tmon_test_params { +} tmon_test_params_t; + +/** 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 **); +} tmon_test_ops_t; + +int tmon_test_main(int, char **, const tmon_test_ops_t *); + +#endif /* TMON_TEST_H_ */ + +/** @} + */