X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fcommands.c;h=d605b6d7475b261c0d552b2a420a1f0b6b1c7fa9;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=71dbf969549cc29e58bda8cc19e8763b3b50ac24;hpb=32832fc6c08ed3f9afbe08ba203d4196f4643a1b;p=dpdk.git diff --git a/app/test/commands.c b/app/test/commands.c index 71dbf96954..d605b6d747 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 @@ -86,75 +88,112 @@ static void cmd_autotest_parsed(void *parsed_result, { 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, "lpm_autotest")) - ret |= test_lpm(); - if (all || !strcmp(res->autotest, "cpuflags_autotest")) - ret |= test_cpuflags(); - /* 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 (!strcmp(res->autotest, "version_autotest")) + ret = test_version(); + if (!strcmp(res->autotest, "eal_fs_autotest")) + ret = test_eal_fs(); + if (!strcmp(res->autotest, "debug_autotest")) + ret = test_debug(); + if (!strcmp(res->autotest, "pci_autotest")) + ret = test_pci(); + if (!strcmp(res->autotest, "prefetch_autotest")) + ret = test_prefetch(); + if (!strcmp(res->autotest, "byteorder_autotest")) + ret = test_byteorder(); + if (!strcmp(res->autotest, "per_lcore_autotest")) + ret = test_per_lcore(); + if (!strcmp(res->autotest, "atomic_autotest")) + ret = test_atomic(); + if (!strcmp(res->autotest, "malloc_autotest")) + ret = test_malloc(); + if (!strcmp(res->autotest, "spinlock_autotest")) + ret = test_spinlock(); + if (!strcmp(res->autotest, "memory_autotest")) + ret = test_memory(); + if (!strcmp(res->autotest, "memzone_autotest")) + ret = test_memzone(); + if (!strcmp(res->autotest, "rwlock_autotest")) + ret = test_rwlock(); + if (!strcmp(res->autotest, "mbuf_autotest")) + ret = test_mbuf(); + if (!strcmp(res->autotest, "logs_autotest")) + ret = test_logs(); + if (!strcmp(res->autotest, "errno_autotest")) + ret = test_errno(); + if (!strcmp(res->autotest, "hash_autotest")) + ret = test_hash(); + if (!strcmp(res->autotest, "hash_perf_autotest")) + ret = test_hash_perf(); + if (!strcmp(res->autotest, "lpm_autotest")) + ret = test_lpm(); + if (!strcmp(res->autotest, "lpm6_autotest")) + ret = test_lpm6(); + if (!strcmp(res->autotest, "cpuflags_autotest")) + ret = test_cpuflags(); + if (!strcmp(res->autotest, "cmdline_autotest")) + ret = test_cmdline(); + if (!strcmp(res->autotest, "tailq_autotest")) + ret = test_tailq(); + if (!strcmp(res->autotest, "multiprocess_autotest")) + ret = test_mp_secondary(); + if (!strcmp(res->autotest, "memcpy_autotest")) + ret = test_memcpy(); + if (!strcmp(res->autotest, "string_autotest")) + ret = test_string_fns(); + if (!strcmp(res->autotest, "eal_flags_autotest")) + ret = test_eal_flags(); + if (!strcmp(res->autotest, "alarm_autotest")) + ret = test_alarm(); + if (!strcmp(res->autotest, "interrupt_autotest")) + ret = test_interrupt(); + if (!strcmp(res->autotest, "cycles_autotest")) + ret = test_cycles(); + if (!strcmp(res->autotest, "ring_autotest")) + ret = test_ring(); + if (!strcmp(res->autotest, "ring_perf_autotest")) + ret = test_ring_perf(); + if (!strcmp(res->autotest, "timer_autotest")) + ret = test_timer(); + if (!strcmp(res->autotest, "timer_perf_autotest")) + ret = test_timer_perf(); + if (!strcmp(res->autotest, "mempool_autotest")) + ret = test_mempool(); + if (!strcmp(res->autotest, "mempool_perf_autotest")) + ret = test_mempool_perf(); + if (!strcmp(res->autotest, "memcpy_perf_autotest")) + ret = test_memcpy_perf(); + if (!strcmp(res->autotest, "func_reentrancy_autotest")) + ret = test_func_reentrancy(); + if (!strcmp(res->autotest, "red_autotest")) + ret = test_red(); + if (!strcmp(res->autotest, "sched_autotest")) + ret = test_sched(); + if (!strcmp(res->autotest, "meter_autotest")) + ret = test_meter(); + if (!strcmp(res->autotest, "kni_autotest")) + ret = test_kni(); + if (!strcmp(res->autotest, "power_autotest")) + ret = test_power(); + if (!strcmp(res->autotest, "common_autotest")) + ret = test_common(); + if (!strcmp(res->autotest, "ivshmem_autotest")) + ret = test_ivshmem(); + if (!strcmp(res->autotest, "devargs_autotest")) + ret = test_devargs(); +#ifdef RTE_LIBRTE_PMD_RING + if (!strcmp(res->autotest, "ring_pmd_autotest")) + ret = test_pmd_ring(); +#endif /* RTE_LIBRTE_PMD_RING */ + +#ifdef RTE_LIBRTE_ACL + if (!strcmp(res->autotest, "acl_autotest")) + ret = test_acl(); +#endif /* RTE_LIBRTE_ACL */ +#ifdef RTE_LIBRTE_KVARGS + if (!strcmp(res->autotest, "kvargs_autotest")) + ret |= test_kvargs(); +#endif /* RTE_LIBRTE_KVARGS */ if (ret == 0) printf("Test OK\n"); @@ -175,12 +214,31 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "timer_autotest#malloc_autotest#" "memcpy_autotest#hash_autotest#" "lpm_autotest#debug_autotest#" + "lpm6_autotest#" "errno_autotest#tailq_autotest#" "string_autotest#multiprocess_autotest#" "cpuflags_autotest#eal_flags_autotest#" "alarm_autotest#interrupt_autotest#" "version_autotest#eal_fs_autotest#" - "all_autotests"); + "cmdline_autotest#func_reentrancy_autotest#" + "mempool_perf_autotest#hash_perf_autotest#" + "memcpy_perf_autotest#ring_perf_autotest#" + "red_autotest#meter_autotest#sched_autotest#" + "memcpy_perf_autotest#kni_autotest#" + "pm_autotest#ivshmem_autotest#" + "devargs_autotest#" +#ifdef RTE_LIBRTE_ACL + "acl_autotest#" +#endif + "power_autotest#" + "timer_perf_autotest#" +#ifdef RTE_LIBRTE_PMD_RING + "ring_pmd_autotest#" +#endif +#ifdef RTE_LIBRTE_KVARGS + "kvargs_autotest#" +#endif + "common_autotest"); cmdline_parse_inst_t cmd_autotest = { .f = cmd_autotest_parsed, /* function to call */ @@ -217,23 +275,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 */ @@ -264,7 +325,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; @@ -273,7 +334,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); } } @@ -316,12 +377,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"); @@ -330,7 +386,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); @@ -341,8 +397,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,