X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_mempool_perf.c;h=70de0b35bd4b91ca590fc875bf02e528dc98fc36;hb=995eec619024efe9763b9df85bc75e15d2c65b71;hp=07b28c066b9bc2e0a4ec9c7122047f447eade830;hpb=89665ec20c6abc5e9730b33792e96f65241d7fed;p=dpdk.git

diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c
index 07b28c066b..70de0b35bd 100644
--- a/test/test/test_mempool_perf.c
+++ b/test/test/test_mempool_perf.c
@@ -1,34 +1,5 @@
-/*-
- *   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
- *       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
- *       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
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
@@ -44,7 +15,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 +156,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 +170,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;
 			}
 		}
@@ -314,6 +284,7 @@ test_mempool_perf(void)
 	struct rte_mempool *mp_cache = NULL;
 	struct rte_mempool *mp_nocache = NULL;
 	struct rte_mempool *default_pool = NULL;
+	const char *default_pool_ops;
 	int ret = -1;
 
 	rte_atomic32_init(&synchro);
@@ -337,6 +308,7 @@ test_mempool_perf(void)
 	if (mp_cache == NULL)
 		goto err;
 
+	default_pool_ops = rte_eal_mbuf_default_mempool_ops();
 	/* Create a mempool based on Default handler */
 	default_pool = rte_mempool_create_empty("default_pool",
 						MEMPOOL_SIZE,
@@ -345,21 +317,18 @@ test_mempool_perf(void)
 						SOCKET_ID_ANY, 0);
 
 	if (default_pool == NULL) {
-		printf("cannot allocate %s mempool\n",
-		       RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+		printf("cannot allocate %s mempool\n", default_pool_ops);
 		goto err;
 	}
 
-	if (rte_mempool_set_ops_byname(default_pool,
-				       RTE_MBUF_DEFAULT_MEMPOOL_OPS, NULL)
+	if (rte_mempool_set_ops_byname(default_pool, default_pool_ops, NULL)
 				       < 0) {
-		printf("cannot set %s handler\n", RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+		printf("cannot set %s handler\n", default_pool_ops);
 		goto err;
 	}
 
 	if (rte_mempool_populate_default(default_pool) < 0) {
-		printf("cannot populate %s mempool\n",
-		       RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+		printf("cannot populate %s mempool\n", default_pool_ops);
 		goto err;
 	}
 
@@ -379,7 +348,7 @@ test_mempool_perf(void)
 
 	/* performance test with 1, 2 and max cores */
 	printf("start performance test for %s (without cache)\n",
-	       RTE_MBUF_DEFAULT_MEMPOOL_OPS);
+	       default_pool_ops);
 
 	if (do_one_mempool_test(default_pool, 1) < 0)
 		goto err;