X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_func_reentrancy.c;h=501b2375e9afd701fd8668293b8afb30cd52b2a6;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=c12167bf5367361dee7ce1990acc8cf7f0bf23dd;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index c12167bf53..501b2375e9 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * 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 * are met: - * + * * * 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 @@ -17,7 +17,7 @@ * * 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 @@ -70,8 +70,6 @@ #include -#include - #include "test.h" typedef int (*case_func_t)(void* arg); @@ -94,7 +92,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) @@ -121,7 +119,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); @@ -237,7 +235,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++) { @@ -252,7 +250,7 @@ hash_create_free(__attribute__((unused)) void *arg) 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 */ @@ -305,7 +303,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++) { @@ -321,7 +319,7 @@ fbk_create_free(__attribute__((unused)) void *arg) 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)) @@ -367,7 +365,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); @@ -380,7 +378,7 @@ lpm_create_free(__attribute__((unused)) void *arg) rte_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)) @@ -421,8 +419,8 @@ struct test_case test_cases[] = { #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) @@ -456,11 +454,11 @@ 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; } @@ -484,7 +482,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;