X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_distributor_perf.c;h=92b222010f4f1df8c430ee540a42b8619ca50296;hb=4fce65a6be1779c1bb0d0f0e6806cbadeca77108;hp=48ee344a15918bce1d2bf0fc8fc3f236572c0a3d;hpb=9f2e99d171a13c2e9fd105f609b87aa0c502f497;p=dpdk.git

diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index 48ee344a15..92b222010f 100644
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -35,7 +35,10 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <rte_mempool.h>
 #include <rte_cycles.h>
+#include <rte_common.h>
+#include <rte_mbuf.h>
 #include <rte_distributor.h>
 
 #define ITER_POWER 20 /* log 2 of how many iterations we do when timing. */
@@ -73,7 +76,7 @@ static void
 time_cache_line_switch(void)
 {
 	/* allocate a full cache line for data, we use only first byte of it */
-	uint64_t data[CACHE_LINE_SIZE*3 / sizeof(uint64_t)];
+	uint64_t data[RTE_CACHE_LINE_SIZE*3 / sizeof(uint64_t)];
 
 	unsigned i, slaveid = rte_get_next_lcore(rte_lcore_id(), 0, 0);
 	volatile uint64_t *pdata = &data[0];
@@ -209,8 +212,6 @@ quit_workers(struct rte_distributor *d, struct rte_mempool *p)
 	worker_idx = 0;
 }
 
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-
 static int
 test_distributor_perf(void)
 {
@@ -240,12 +241,8 @@ test_distributor_perf(void)
 	const unsigned nb_bufs = (511 * rte_lcore_count()) < BIG_BATCH ?
 			(BIG_BATCH * 2) - 1 : (511 * rte_lcore_count());
 	if (p == NULL) {
-		p = rte_mempool_create("DPT_MBUF_POOL", nb_bufs,
-				MBUF_SIZE, BURST,
-				sizeof(struct rte_pktmbuf_pool_private),
-				rte_pktmbuf_pool_init, NULL,
-				rte_pktmbuf_init, NULL,
-				rte_socket_id(), 0);
+		p = rte_pktmbuf_pool_create("DPT_MBUF_POOL", nb_bufs, BURST,
+			0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
 		if (p == NULL) {
 			printf("Error creating mempool\n");
 			return -1;