mbuf: fix performance with 128-byte cache line

[dpdk.git] / app / test / test_func_reentrancy.c

diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index 501b237..dbecc52 100644 (file)
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -47,7 +47,6 @@
 #include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_cycles.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -129,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;
@@ -139,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;
        }
@@ -179,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,
@@ -193,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;
        }
@@ -210,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);
@@ -227,9 +226,8 @@ hash_create_free(__attribute__((unused)) void *arg)
        struct rte_hash_parameters hash_params = {
                .name = NULL,
                .entries = 16,
-               .bucket_entries = 4,
                .key_len = 4,
-               .hash_func = (rte_hash_function)rte_jhash2,
+               .hash_func = (rte_hash_function)rte_jhash_32b,
                .hash_func_init_val = 0,
                .socket_id = 0,
        };
@@ -246,7 +244,7 @@ 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);
@@ -262,7 +260,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;
@@ -279,7 +277,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);
@@ -314,7 +312,7 @@ 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);
@@ -330,7 +328,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;
@@ -349,7 +347,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);
@@ -368,15 +366,15 @@ lpm_create_free(__attribute__((unused)) void *arg)
 
        /* 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);
+               lpm = rte_lpm_create("fr_test_once",  SOCKET_ID_ANY, 4, 0);
                if ((NULL == lpm) && (rte_lpm_find_existing("fr_test_once") == NULL))
                        return -1;
        }
 
        /* 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);
-               lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, 4, RTE_LPM_HEAP);
+               snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i);
+               lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, 4, 0);
                if (NULL == lpm)
                        return -1;
 
@@ -389,7 +387,7 @@ 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;
        }
@@ -465,7 +463,7 @@ launch_test(struct test_case *pt_case)
 /**
  * Main entry of func_reentrancy test
  */
-int
+static int
 test_func_reentrancy(void)
 {
        uint32_t case_id;
@@ -492,3 +490,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);