X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fcommands.c;h=9ea3c6276375e2b2b4c9abbd9cbc0f20f16f1f7f;hb=9aaccf1abdb2894ec23870e1d2199a657f85850e;hp=08432fa65f297ea19842c00383ef51c165285fea;hpb=104a92bd026f88bd191f728442b88ad837c16138;p=dpdk.git diff --git a/app/test/commands.c b/app/test/commands.c index 08432fa65f..9ea3c62763 100644 --- a/app/test/commands.c +++ b/app/test/commands.c @@ -1,35 +1,35 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2014 6WIND S.A. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * 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 + * + * * 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 + * * 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. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 COPYRIGHT - * OWNER OR CONTRIBUTORS 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 + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 COPYRIGHT + * OWNER OR CONTRIBUTORS 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. - * */ #include @@ -40,8 +40,10 @@ #include #include #ifndef __linux__ +#ifndef __FreeBSD__ #include #endif +#endif #include #include #include @@ -63,7 +65,7 @@ #include #include #include -#include +#include #include #include @@ -76,6 +78,15 @@ /****************/ +static struct test_commands_list commands_list = + TAILQ_HEAD_INITIALIZER(commands_list); + +void +add_test_command(struct test_command *t) +{ + TAILQ_INSERT_TAIL(&commands_list, t, next); +} + struct cmd_autotest_result { cmdline_fixed_string_t autotest; }; @@ -84,87 +95,14 @@ static void cmd_autotest_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, __attribute__((unused)) void *data) { + struct test_command *t; struct cmd_autotest_result *res = parsed_result; int ret = 0; - int all = 0; - - if (!strcmp(res->autotest, "all_autotests")) - all = 1; - - if (all || !strcmp(res->autotest, "version_autotest")) - ret |= test_version(); - if (all || !strcmp(res->autotest, "eal_fs_autotest")) - ret |= test_eal_fs(); - if (all || !strcmp(res->autotest, "debug_autotest")) - ret |= test_debug(); - if (all || !strcmp(res->autotest, "pci_autotest")) - ret |= test_pci(); - if (all || !strcmp(res->autotest, "prefetch_autotest")) - ret |= test_prefetch(); - if (all || !strcmp(res->autotest, "byteorder_autotest")) - ret |= test_byteorder(); - if (all || !strcmp(res->autotest, "per_lcore_autotest")) - ret |= test_per_lcore(); - if (all || !strcmp(res->autotest, "atomic_autotest")) - ret |= test_atomic(); - if (all || !strcmp(res->autotest, "malloc_autotest")) - ret |= test_malloc(); - if (all || !strcmp(res->autotest, "spinlock_autotest")) - ret |= test_spinlock(); - if (all || !strcmp(res->autotest, "memory_autotest")) - ret |= test_memory(); - if (all || !strcmp(res->autotest, "memzone_autotest")) - ret |= test_memzone(); - if (all || !strcmp(res->autotest, "rwlock_autotest")) - ret |= test_rwlock(); - if (all || !strcmp(res->autotest, "mbuf_autotest")) - ret |= test_mbuf(); - if (all || !strcmp(res->autotest, "logs_autotest")) - ret |= test_logs(); - if (all || !strcmp(res->autotest, "errno_autotest")) - ret |= test_errno(); - if (all || !strcmp(res->autotest, "hash_autotest")) - ret |= test_hash(); - if (all || !strcmp(res->autotest, "hash_perf_autotest")) - ret |= test_hash_perf(); - if (all || !strcmp(res->autotest, "lpm_autotest")) - ret |= test_lpm(); - if (all || !strcmp(res->autotest, "cpuflags_autotest")) - ret |= test_cpuflags(); - if (all || !strcmp(res->autotest, "cmdline_autotest")) - ret |= test_cmdline(); - /* tailq autotest must go after all lpm and hashs tests or any other - * tests which need to create tailq objects (ring and mempool are implicitly - * created in earlier tests so can go later) - */ - if (all || !strcmp(res->autotest, "tailq_autotest")) - ret |= test_tailq(); - if (all || !strcmp(res->autotest, "multiprocess_autotest")) - ret |= test_mp_secondary(); - if (all || !strcmp(res->autotest, "memcpy_autotest")) - ret |= test_memcpy(); - if (all || !strcmp(res->autotest, "string_autotest")) - ret |= test_string_fns(); - if (all || !strcmp(res->autotest, "eal_flags_autotest")) - ret |= test_eal_flags(); - if (all || !strcmp(res->autotest, "alarm_autotest")) - ret |= test_alarm(); - if (all || !strcmp(res->autotest, "interrupt_autotest")) - ret |= test_interrupt(); - if (all || !strcmp(res->autotest, "cycles_autotest")) - ret |= test_cycles(); - if (all || !strcmp(res->autotest, "ring_autotest")) - ret |= test_ring(); - if (all || !strcmp(res->autotest, "timer_autotest")) - ret |= test_timer(); - if (all || !strcmp(res->autotest, "mempool_autotest")) - ret |= test_mempool(); - if (all || !strcmp(res->autotest, "mempool_perf_autotest")) - ret |= test_mempool_perf(); - if (all || !strcmp(res->autotest, "memcpy_perf_autotest")) - ret |= test_memcpy_perf(); - if (all || !strcmp(res->autotest, "func_reentrancy_autotest")) - ret |= test_func_reentrancy(); + + TAILQ_FOREACH(t, &commands_list, next) { + if (!strcmp(res->autotest, t->command)) + ret = t->callback(); + } if (ret == 0) printf("Test OK\n"); @@ -175,25 +113,7 @@ static void cmd_autotest_parsed(void *parsed_result, cmdline_parse_token_string_t cmd_autotest_autotest = TOKEN_STRING_INITIALIZER(struct cmd_autotest_result, autotest, - "pci_autotest#memory_autotest#" - "per_lcore_autotest#spinlock_autotest#" - "rwlock_autotest#atomic_autotest#" - "byteorder_autotest#prefetch_autotest#" - "cycles_autotest#logs_autotest#" - "memzone_autotest#ring_autotest#" - "mempool_autotest#mbuf_autotest#" - "timer_autotest#malloc_autotest#" - "memcpy_autotest#hash_autotest#" - "lpm_autotest#debug_autotest#" - "errno_autotest#tailq_autotest#" - "string_autotest#multiprocess_autotest#" - "cpuflags_autotest#eal_flags_autotest#" - "alarm_autotest#interrupt_autotest#" - "version_autotest#eal_fs_autotest#" - "cmdline_autotest#func_reentrancy_autotest#" - "mempool_perf_autotest#hash_perf_autotest#" - "memcpy_perf_autotest#" - "all_autotests"); + ""); cmdline_parse_inst_t cmd_autotest = { .f = cmd_autotest_parsed, /* function to call */ @@ -217,7 +137,6 @@ dump_struct_sizes(void) #define DUMP_SIZE(t) printf("sizeof(" #t ") = %u\n", (unsigned)sizeof(t)); DUMP_SIZE(struct rte_mbuf); DUMP_SIZE(struct rte_pktmbuf); - DUMP_SIZE(struct rte_ctrlmbuf); DUMP_SIZE(struct rte_mempool); DUMP_SIZE(struct rte_ring); #undef DUMP_SIZE @@ -230,23 +149,26 @@ static void cmd_dump_parsed(void *parsed_result, struct cmd_dump_result *res = parsed_result; if (!strcmp(res->dump, "dump_physmem")) - rte_dump_physmem_layout(); + rte_dump_physmem_layout(stdout); else if (!strcmp(res->dump, "dump_memzone")) - rte_memzone_dump(); + rte_memzone_dump(stdout); else if (!strcmp(res->dump, "dump_log_history")) - rte_log_dump_history(); + rte_log_dump_history(stdout); else if (!strcmp(res->dump, "dump_struct_sizes")) dump_struct_sizes(); else if (!strcmp(res->dump, "dump_ring")) - rte_ring_list_dump(); + rte_ring_list_dump(stdout); else if (!strcmp(res->dump, "dump_mempool")) - rte_mempool_list_dump(); + rte_mempool_list_dump(stdout); + else if (!strcmp(res->dump, "dump_devargs")) + rte_eal_devargs_dump(stdout); } cmdline_parse_token_string_t cmd_dump_dump = TOKEN_STRING_INITIALIZER(struct cmd_dump_result, dump, "dump_physmem#dump_memzone#dump_log_history#" - "dump_struct_sizes#dump_ring#dump_mempool"); + "dump_struct_sizes#dump_ring#dump_mempool#" + "dump_devargs"); cmdline_parse_inst_t cmd_dump = { .f = cmd_dump_parsed, /* function to call */ @@ -277,7 +199,7 @@ static void cmd_dump_one_parsed(void *parsed_result, struct cmdline *cl, cmdline_printf(cl, "Cannot find ring\n"); return; } - rte_ring_dump(r); + rte_ring_dump(stdout, r); } else if (!strcmp(res->dump, "dump_mempool")) { struct rte_mempool *mp; @@ -286,7 +208,7 @@ static void cmd_dump_one_parsed(void *parsed_result, struct cmdline *cl, cmdline_printf(cl, "Cannot find mempool\n"); return; } - rte_mempool_dump(mp); + rte_mempool_dump(stdout, mp); } } @@ -329,12 +251,7 @@ static void cmd_set_ring_parsed(void *parsed_result, struct cmdline *cl, return; } - if (!strcmp(res->set, "set_quota")) { - ret = rte_ring_set_bulk_count(r, res->value); - if (ret != 0) - cmdline_printf(cl, "Cannot set quota\n"); - } - else if (!strcmp(res->set, "set_watermark")) { + if (!strcmp(res->set, "set_watermark")) { ret = rte_ring_set_water_mark(r, res->value); if (ret != 0) cmdline_printf(cl, "Cannot set water mark\n"); @@ -343,7 +260,7 @@ static void cmd_set_ring_parsed(void *parsed_result, struct cmdline *cl, cmdline_parse_token_string_t cmd_set_ring_set = TOKEN_STRING_INITIALIZER(struct cmd_set_ring_result, set, - "set_quota#set_watermark"); + "set_watermark"); cmdline_parse_token_string_t cmd_set_ring_name = TOKEN_STRING_INITIALIZER(struct cmd_set_ring_result, name, NULL); @@ -354,8 +271,8 @@ cmdline_parse_token_num_t cmd_set_ring_value = cmdline_parse_inst_t cmd_set_ring = { .f = cmd_set_ring_parsed, /* function to call */ .data = NULL, /* 2nd arg of func */ - .help_str = "set quota/watermark: " - "set_quota|set_watermark ", + .help_str = "set watermark: " + "set_watermark ", .tokens = { /* token list, NULL terminated */ (void *)&cmd_set_ring_set, (void *)&cmd_set_ring_name, @@ -403,3 +320,27 @@ cmdline_parse_ctx_t main_ctx[] = { NULL, }; +int commands_init(void) +{ + struct test_command *t; + char *commands, *ptr; + int commands_len = 0; + + TAILQ_FOREACH(t, &commands_list, next) { + commands_len += strlen(t->command) + 1; + } + + commands = malloc(commands_len); + if (!commands) + return -1; + + ptr = commands; + TAILQ_FOREACH(t, &commands_list, next) { + ptr += sprintf(ptr, "%s#", t->command); + } + ptr--; + ptr[0] = '\0'; + + cmd_autotest_autotest.string_data.str = commands; + return 0; +}