pdump: fix error code check when creating/canceling pthread

[dpdk.git] / test / test / test_mempool_perf.c

diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c
index 3749cf8..749b364 100644 (file)
--- a/test/test/test_mempool_perf.c
+++ b/test/test/test_mempool_perf.c
@@ -44,7 +44,6 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_cycles.h>
 #include <rte_eal.h>
@@ -186,7 +185,7 @@ per_lcore_mempool_test(void *arg)
                                ret = rte_mempool_generic_get(mp,
                                                              &obj_table[idx],
                                                              n_get_bulk,
-                                                             cache, 0);
+                                                             cache);
                                if (unlikely(ret < 0)) {
                                        rte_mempool_dump(stdout, mp);
                                        /* in this case, objects are lost... */
@@ -200,7 +199,7 @@ per_lcore_mempool_test(void *arg)
                        while (idx < n_keep) {
                                rte_mempool_generic_put(mp, &obj_table[idx],
                                                        n_put_bulk,
-                                                       cache, 0);
+                                                       cache);
                                idx += n_put_bulk;
                        }
                }
@@ -313,6 +312,7 @@ test_mempool_perf(void)
 {
        struct rte_mempool *mp_cache = NULL;
        struct rte_mempool *mp_nocache = NULL;
+       struct rte_mempool *default_pool = NULL;
        int ret = -1;
 
        rte_atomic32_init(&synchro);
@@ -336,6 +336,34 @@ test_mempool_perf(void)
        if (mp_cache == NULL)
                goto err;
 
+       /* Create a mempool based on Default handler */
+       default_pool = rte_mempool_create_empty("default_pool",
+                                               MEMPOOL_SIZE,
+                                               MEMPOOL_ELT_SIZE,
+                                               0, 0,
+                                               SOCKET_ID_ANY, 0);
+
+       if (default_pool == NULL) {
+               printf("cannot allocate %s mempool\n",
+                      RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+               goto err;
+       }
+
+       if (rte_mempool_set_ops_byname(default_pool,
+                                      RTE_MBUF_DEFAULT_MEMPOOL_OPS, NULL)
+                                      < 0) {
+               printf("cannot set %s handler\n", RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+               goto err;
+       }
+
+       if (rte_mempool_populate_default(default_pool) < 0) {
+               printf("cannot populate %s mempool\n",
+                      RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+               goto err;
+       }
+
+       rte_mempool_obj_iter(default_pool, my_obj_init, NULL);
+
        /* performance test with 1, 2 and max cores */
        printf("start performance test (without cache)\n");
 
@@ -348,6 +376,19 @@ test_mempool_perf(void)
        if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0)
                goto err;
 
+       /* performance test with 1, 2 and max cores */
+       printf("start performance test for %s (without cache)\n",
+              RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+
+       if (do_one_mempool_test(default_pool, 1) < 0)
+               goto err;
+
+       if (do_one_mempool_test(default_pool, 2) < 0)
+               goto err;
+
+       if (do_one_mempool_test(default_pool, rte_lcore_count()) < 0)
+               goto err;
+
        /* performance test with 1, 2 and max cores */
        printf("start performance test (with cache)\n");
 
@@ -380,6 +421,7 @@ test_mempool_perf(void)
 err:
        rte_mempool_free(mp_cache);
        rte_mempool_free(mp_nocache);
+       rte_mempool_free(default_pool);
        return ret;
 }