X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_func_reentrancy.c;h=dc070af96781d304c4ff41f63a74bf500e74c359;hb=ff708facfcbf42f3dcb3c62d82ecd93e7b8c2506;hp=6ece836451b4b49990cea719e019f61143089027;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index 6ece836451..dc070af967 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 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 @@ -48,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -58,13 +56,18 @@ #include #include #include + +#ifdef RTE_LIBRTE_HASH #include #include #include +#endif /* RTE_LIBRTE_HASH */ + +#ifdef RTE_LIBRTE_LPM #include -#include +#endif /* RTE_LIBRTE_LPM */ -#include +#include #include "test.h" @@ -88,7 +91,7 @@ static rte_atomic32_t synchro = RTE_ATOMIC32_INIT(0); } while(0) /* - * rte_eal_init only init once + * rte_eal_init only init once */ static int test_eal_init_once(__attribute__((unused)) void *arg) @@ -115,7 +118,7 @@ ring_create_lookup(__attribute__((unused)) void *arg) int i; WAIT_SYNCHRO_FOR_SLAVES(); - + /* create the same ring simultaneously on all threads */ for (i = 0; i < MAX_ITER_TIMES; i++) { rp = rte_ring_create("fr_test_once", 4096, SOCKET_ID_ANY, 0); @@ -125,7 +128,7 @@ ring_create_lookup(__attribute__((unused)) void *arg) /* create/lookup new ring several times */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(ring_name, sizeof(ring_name), "fr_test_%d_%d", lcore_self, i); + snprintf(ring_name, sizeof(ring_name), "fr_test_%d_%d", lcore_self, i); rp = rte_ring_create(ring_name, 4096, SOCKET_ID_ANY, 0); if (NULL == rp) return -1; @@ -135,7 +138,7 @@ ring_create_lookup(__attribute__((unused)) void *arg) /* verify all ring created sucessful */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(ring_name, sizeof(ring_name), "fr_test_%d_%d", lcore_self, i); + snprintf(ring_name, sizeof(ring_name), "fr_test_%d_%d", lcore_self, i); if (rte_ring_lookup(ring_name) == NULL) return -1; } @@ -175,7 +178,7 @@ mempool_create_lookup(__attribute__((unused)) void *arg) /* create/lookup new ring several times */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d", lcore_self, i); + snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d", lcore_self, i); mp = rte_mempool_create(mempool_name, MEMPOOL_SIZE, MEMPOOL_ELT_SIZE, 0, 0, NULL, NULL, @@ -189,7 +192,7 @@ mempool_create_lookup(__attribute__((unused)) void *arg) /* verify all ring created sucessful */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d", lcore_self, i); + snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d", lcore_self, i); if (rte_mempool_lookup(mempool_name) == NULL) return -1; } @@ -197,6 +200,7 @@ mempool_create_lookup(__attribute__((unused)) void *arg) return 0; } +#ifdef RTE_LIBRTE_HASH static void hash_clean(unsigned lcore_id) { @@ -205,7 +209,7 @@ hash_clean(unsigned lcore_id) int i; for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_id, i); + snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_id, i); if ((handle = rte_hash_find_existing(hash_name)) != NULL) rte_hash_free(handle); @@ -230,7 +234,7 @@ hash_create_free(__attribute__((unused)) void *arg) }; WAIT_SYNCHRO_FOR_SLAVES(); - + /* create the same hash simultaneously on all threads */ hash_params.name = "fr_test_once"; for (i = 0; i < MAX_ITER_TIMES; i++) { @@ -241,11 +245,11 @@ hash_create_free(__attribute__((unused)) void *arg) /* create mutiple times simultaneously */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_self, i); + snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_self, i); hash_params.name = hash_name; handle = rte_hash_create(&hash_params); - if (NULL == handle) + if (NULL == handle) return -1; /* verify correct existing and then free all */ @@ -257,7 +261,7 @@ hash_create_free(__attribute__((unused)) void *arg) /* verify free correct */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_self, i); + snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d", lcore_self, i); if (NULL != rte_hash_find_existing(hash_name)) return -1; @@ -274,7 +278,7 @@ fbk_clean(unsigned lcore_id) int i; for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_id, i); + snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_id, i); if ((handle = rte_fbk_hash_find_existing(fbk_name)) != NULL) rte_fbk_hash_free(handle); @@ -298,7 +302,7 @@ fbk_create_free(__attribute__((unused)) void *arg) }; WAIT_SYNCHRO_FOR_SLAVES(); - + /* create the same fbk hash table simultaneously on all threads */ fbk_params.name = "fr_test_once"; for (i = 0; i < MAX_ITER_TIMES; i++) { @@ -309,12 +313,12 @@ fbk_create_free(__attribute__((unused)) void *arg) /* create mutiple fbk tables simultaneously */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_self, i); + snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_self, i); fbk_params.name = fbk_name; handle = rte_fbk_hash_create(&fbk_params); if (NULL == handle) - return -1; + return -1; /* verify correct existing and then free all */ if (handle != rte_fbk_hash_find_existing(fbk_name)) @@ -325,7 +329,7 @@ fbk_create_free(__attribute__((unused)) void *arg) /* verify free correct */ for (i = 0; i < MAX_ITER_TIMES; i++) { - rte_snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_self, i); + snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d", lcore_self, i); if (NULL != rte_fbk_hash_find_existing(fbk_name)) return -1; @@ -333,7 +337,9 @@ fbk_create_free(__attribute__((unused)) void *arg) return 0; } +#endif /* RTE_LIBRTE_HASH */ +#ifdef RTE_LIBRTE_LPM static void lpm_clean(unsigned lcore_id) { @@ -342,7 +348,7 @@ lpm_clean(unsigned lcore_id) int i; for (i = 0; i < MAX_LPM_ITER_TIMES; i++) { - rte_snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_id, i); + snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_id, i); if ((lpm = rte_lpm_find_existing(lpm_name)) != NULL) rte_lpm_free(lpm); @@ -358,7 +364,7 @@ lpm_create_free(__attribute__((unused)) void *arg) int i; WAIT_SYNCHRO_FOR_SLAVES(); - + /* create the same lpm simultaneously on all threads */ for (i = 0; i < MAX_ITER_TIMES; i++) { lpm = rte_lpm_create("fr_test_once", SOCKET_ID_ANY, 4, RTE_LPM_HEAP); @@ -368,10 +374,10 @@ lpm_create_free(__attribute__((unused)) void *arg) /* create mutiple fbk tables simultaneously */ for (i = 0; i < MAX_LPM_ITER_TIMES; i++) { - rte_snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i); + snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i); lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, 4, RTE_LPM_HEAP); if (NULL == lpm) - return -1; + return -1; /* verify correct existing and then free all */ if (lpm != rte_lpm_find_existing(lpm_name)) @@ -382,13 +388,14 @@ lpm_create_free(__attribute__((unused)) void *arg) /* verify free correct */ for (i = 0; i < MAX_LPM_ITER_TIMES; i++) { - rte_snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i); + snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i); if (NULL != rte_lpm_find_existing(lpm_name)) return -1; } return 0; } +#endif /* RTE_LIBRTE_LPM */ struct test_case{ case_func_t func; @@ -402,13 +409,17 @@ struct test_case test_cases[] = { { test_eal_init_once, NULL, NULL, "eal init once" }, { ring_create_lookup, NULL, NULL, "ring create/lookup" }, { mempool_create_lookup, NULL, NULL, "mempool create/lookup" }, +#ifdef RTE_LIBRTE_HASH { hash_create_free, NULL, hash_clean, "hash create/free" }, { fbk_create_free, NULL, fbk_clean, "fbk create/free" }, +#endif /* RTE_LIBRTE_HASH */ +#ifdef RTE_LIBRTE_LPM { lpm_create_free, NULL, lpm_clean, "lpm create/free" }, +#endif /* RTE_LIBRTE_LPM */ }; -/** - * launch test case in two separate thread +/** + * launch test case in two separate thread */ static int launch_test(struct test_case *pt_case) @@ -442,18 +453,18 @@ launch_test(struct test_case *pt_case) cores--; if (rte_eal_wait_lcore(lcore_id) < 0) ret = -1; - + if (pt_case->clean != NULL) pt_case->clean(lcore_id); } - + return ret; } /** * Main entry of func_reentrancy test */ -int +static int test_func_reentrancy(void) { uint32_t case_id; @@ -470,7 +481,7 @@ test_func_reentrancy(void) pt_case = &test_cases[case_id]; if (pt_case->func == NULL) continue; - + if (launch_test(pt_case) < 0) { printf("Func-ReEnt CASE %"PRIu32": %s FAIL\n", case_id, pt_case->name); return -1; @@ -480,3 +491,9 @@ test_func_reentrancy(void) return 0; } + +static struct test_command func_reentrancy_cmd = { + .command = "func_reentrancy_autotest", + .callback = test_func_reentrancy, +}; +REGISTER_TEST_COMMAND(func_reentrancy_cmd);