X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fcommands.c;h=477081789123635402ce55960987e6a03cef3537;hb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;hp=fd488d5fc407fb97ed0dfd91b564721471d3a35f;hpb=dbb860e03eb12ad621cbb68a0f3f1752bf188ab0;p=dpdk.git diff --git a/app/test/commands.c b/app/test/commands.c index fd488d5fc4..4770817891 100644 --- a/app/test/commands.c +++ b/app/test/commands.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * 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 @@ -125,8 +124,12 @@ static void cmd_autotest_parsed(void *parsed_result, 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, "lpm6_autotest")) + ret |= test_lpm6(); if (all || !strcmp(res->autotest, "cpuflags_autotest")) ret |= test_cpuflags(); if (all || !strcmp(res->autotest, "cmdline_autotest")) @@ -153,10 +156,41 @@ static void cmd_autotest_parsed(void *parsed_result, ret |= test_cycles(); if (all || !strcmp(res->autotest, "ring_autotest")) ret |= test_ring(); + if (all || !strcmp(res->autotest, "ring_perf_autotest")) + ret |= test_ring_perf(); if (all || !strcmp(res->autotest, "timer_autotest")) ret |= test_timer(); + if (all || !strcmp(res->autotest, "timer_perf_autotest")) + ret |= test_timer_perf(); 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(); + if (all || !strcmp(res->autotest, "red_autotest")) + ret |= test_red(); + if (all || !strcmp(res->autotest, "sched_autotest")) + ret |= test_sched(); + if (all || !strcmp(res->autotest, "meter_autotest")) + ret |= test_meter(); + if (all || !strcmp(res->autotest, "kni_autotest")) + ret |= test_kni(); + if (all || !strcmp(res->autotest, "power_autotest")) + ret |= test_power(); + if (all || !strcmp(res->autotest, "common_autotest")) + ret |= test_common(); +#ifdef RTE_LIBRTE_PMD_RING + if (all || !strcmp(res->autotest, "ring_pmd_autotest")) + ret |= test_pmd_ring(); +#endif /* RTE_LIBRTE_PMD_RING */ + +#ifdef RTE_LIBRTE_ACL + if (all || !strcmp(res->autotest, "acl_autotest")) + ret |= test_acl(); +#endif /* RTE_LIBRTE_ACL */ if (ret == 0) printf("Test OK\n"); @@ -177,13 +211,27 @@ cmdline_parse_token_string_t cmd_autotest_autotest = "timer_autotest#malloc_autotest#" "memcpy_autotest#hash_autotest#" "lpm_autotest#debug_autotest#" + "lpm6_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#" - "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#" +#ifdef RTE_LIBRTE_ACL + "acl_autotest#" +#endif + "power_autotest#" + "timer_perf_autotest#" +#ifdef RTE_LIBRTE_PMD_RING + "ring_pmd_autotest#" +#endif + "common_autotest#all_autotests"); cmdline_parse_inst_t cmd_autotest = { .f = cmd_autotest_parsed, /* function to call */ @@ -319,12 +367,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"); @@ -333,7 +376,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); @@ -344,8 +387,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,