X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest.c;h=516829d3aff49c165feb6c536832e549bb4e82e7;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=b2c06f874dde6dadee193eb6f4e2c068e920858e;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git diff --git a/app/test/test.c b/app/test/test.c index b2c06f874d..516829d3af 100644 --- a/app/test/test.c +++ b/app/test/test.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 @@ -42,20 +41,29 @@ #include #include +#ifdef RTE_LIBRTE_CMDLINE #include #include #include #include +extern cmdline_parse_ctx_t main_ctx[]; +#endif #include #include #include #include -#include +#include +#include #include +#ifdef RTE_LIBRTE_TIMER +#include +#endif #include "test.h" +#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1 + const char *prgname; /* to be set to argv[0] */ #ifndef RTE_EXEC_ENV_BAREMETAL @@ -76,9 +84,18 @@ do_recursive_call(void) { "test_missing_c_flag", no_action }, { "test_missing_n_flag", no_action }, { "test_no_hpet_flag", no_action }, + { "test_whitelist_flag", no_action }, { "test_invalid_b_flag", no_action }, { "test_invalid_r_flag", no_action }, +#ifdef RTE_LIBRTE_XEN_DOM0 + { "test_dom0_misc_flags", no_action }, +#else { "test_misc_flags", no_action }, +#endif + { "test_memory_flags", no_action }, + { "test_file_prefix", no_action }, + { "test_no_huge_flag", no_action }, + { "test_ivshmem", test_ivshmem }, }; if (recursive_call == NULL) @@ -87,51 +104,27 @@ do_recursive_call(void) if (strcmp(actions[i].env_var, recursive_call) == 0) return (actions[i].action_fn)(); } + printf("ERROR - missing action to take for %s\n", recursive_call); return -1; } #endif -void -test_hexdump(const char *title, const void *buf, unsigned int len) -{ - unsigned int i, out, ofs; - const unsigned char *data = buf; -#define LINE_LEN 80 - char line[LINE_LEN]; /* space needed 8+16*3+3+16 == 75 */ - - printf("%s at [%p], len=%u\n", title, data, len); - ofs = 0; - while (ofs < len) { - /* format 1 line in the buffer, then use printf to print them */ - out = rte_snprintf(line, LINE_LEN, "%08X", ofs); - for (i = 0; ofs+i < len && i < 16; i++) - out += rte_snprintf(line+out, LINE_LEN - out, " %02X", - data[ofs+i]&0xff); - for(; i <= 16; i++) - out += rte_snprintf(line+out, LINE_LEN - out, " "); - for(i = 0; ofs < len && i < 16; i++, ofs++) { - unsigned char c = data[ofs]; - if (!isascii(c) || !isprint(c)) - c = '.'; - out += rte_snprintf(line+out, LINE_LEN - out, "%c", c); - } - printf("%s\n", line); - } -} - int main(int argc, char **argv) { +#ifdef RTE_LIBRTE_CMDLINE struct cmdline *cl; +#endif int ret; ret = rte_eal_init(argc, argv); if (ret < 0) return -1; +#ifdef RTE_LIBRTE_TIMER rte_timer_subsystem_init(); +#endif - argc -= ret; argv += ret; prgname = argv[0]; @@ -141,12 +134,21 @@ main(int argc, char **argv) return do_recursive_call(); #endif +#ifdef RTE_LIBEAL_USE_HPET + if (rte_eal_hpet_init(1) < 0) +#endif + RTE_LOG(INFO, APP, + "HPET is not enabled, using TSC as default timer\n"); + + +#ifdef RTE_LIBRTE_CMDLINE cl = cmdline_stdin_new(main_ctx, "RTE>>"); if (cl == NULL) { return -1; } cmdline_interact(cl); cmdline_stdin_exit(cl); +#endif return 0; }