update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / app / test / test_func_reentrancy.c

diff --git a/ceph/src/spdk/dpdk/app/test/test_func_reentrancy.c b/ceph/src/spdk/dpdk/app/test/test_func_reentrancy.c
index e27d1e020ff688526572c57b2861a409d46f648e..f5ddd03d7670cdeb4f8d6a0a87203f473d3321c9 100644 (file)
--- a/ceph/src/spdk/dpdk/app/test/test_func_reentrancy.c
+++ b/ceph/src/spdk/dpdk/app/test/test_func_reentrancy.c
@@ -66,7 +66,7 @@ static rte_atomic32_t synchro = RTE_ATOMIC32_INIT(0);
  * rte_eal_init only init once
  */
 static int
-test_eal_init_once(__attribute__((unused)) void *arg)
+test_eal_init_once(__rte_unused void *arg)
 {
        unsigned lcore_self =  rte_lcore_id();
 
@@ -99,7 +99,7 @@ ring_clean(unsigned int lcore_id)
 }
 
 static int
-ring_create_lookup(__attribute__((unused)) void *arg)
+ring_create_lookup(__rte_unused void *arg)
 {
        unsigned lcore_self = rte_lcore_id();
        struct rte_ring * rp;
@@ -133,7 +133,7 @@ ring_create_lookup(__attribute__((unused)) void *arg)
 }
 
 static void
-my_obj_init(struct rte_mempool *mp, __attribute__((unused)) void *arg,
+my_obj_init(struct rte_mempool *mp, __rte_unused void *arg,
            void *obj, unsigned i)
 {
        uint32_t *objnum = obj;
@@ -159,7 +159,7 @@ mempool_clean(unsigned int lcore_id)
 }
 
 static int
-mempool_create_lookup(__attribute__((unused)) void *arg)
+mempool_create_lookup(__rte_unused void *arg)
 {
        unsigned lcore_self = rte_lcore_id();
        struct rte_mempool * mp;
@@ -217,7 +217,7 @@ hash_clean(unsigned lcore_id)
 }
 
 static int
-hash_create_free(__attribute__((unused)) void *arg)
+hash_create_free(__rte_unused void *arg)
 {
        unsigned lcore_self = rte_lcore_id();
        struct rte_hash *handle;
@@ -281,7 +281,7 @@ fbk_clean(unsigned lcore_id)
 }
 
 static int
-fbk_create_free(__attribute__((unused)) void *arg)
+fbk_create_free(__rte_unused void *arg)
 {
        unsigned lcore_self = rte_lcore_id();
        struct rte_fbk_hash_table *handle;
@@ -347,7 +347,7 @@ lpm_clean(unsigned int lcore_id)
 }
 
 static int
-lpm_create_free(__attribute__((unused)) void *arg)
+lpm_create_free(__rte_unused void *arg)
 {
        unsigned lcore_self = rte_lcore_id();
        struct rte_lpm *lpm;
@@ -473,14 +473,14 @@ test_func_reentrancy(void)
        uint32_t case_id;
        struct test_case *pt_case = NULL;
 
-       if (rte_lcore_count() <= 1) {
-               printf("Not enough lcore for testing\n");
-               return -1;
+       if (rte_lcore_count() < 2) {
+               printf("Not enough cores for func_reentrancy_autotest, expecting at least 2\n");
+               return TEST_SKIPPED;
        }
        else if (rte_lcore_count() > MAX_LCORES)
                printf("Too many lcores, some cores will be disabled\n");
 
-       for (case_id = 0; case_id < sizeof(test_cases)/sizeof(struct test_case); case_id ++) {
+       for (case_id = 0; case_id < RTE_DIM(test_cases); case_id++) {
                pt_case = &test_cases[case_id];
                if (pt_case->func == NULL)
                        continue;