X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_mempool_perf.c;h=07b28c066b9bc2e0a4ec9c7122047f447eade830;hb=f1ae15bac8aaa75aeb4fa886fd4d74d34c373193;hp=1b4045eb37e1a154392ba89ec1c421df0cd89dab;hpb=58856272bad4554b2ada9f5ff42dea61ecba4907;p=dpdk.git

diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c
index 1b4045eb37..07b28c066b 100644
--- a/test/test/test_mempool_perf.c
+++ b/test/test/test_mempool_perf.c
@@ -313,6 +313,8 @@ 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);
 
@@ -323,7 +325,7 @@ test_mempool_perf(void)
 					my_obj_init, NULL,
 					SOCKET_ID_ANY, 0);
 	if (mp_nocache == NULL)
-		return -1;
+		goto err;
 
 	/* create a mempool (with cache) */
 	mp_cache = rte_mempool_create("perf_test_cache", MEMPOOL_SIZE,
@@ -333,48 +335,95 @@ test_mempool_perf(void)
 				      my_obj_init, NULL,
 				      SOCKET_ID_ANY, 0);
 	if (mp_cache == NULL)
-		return -1;
+		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");
 
 	if (do_one_mempool_test(mp_nocache, 1) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_nocache, 2) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0)
-		return -1;
+		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");
 
 	if (do_one_mempool_test(mp_cache, 1) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_cache, 2) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_cache, rte_lcore_count()) < 0)
-		return -1;
+		goto err;
 
 	/* performance test with 1, 2 and max cores */
 	printf("start performance test (with user-owned cache)\n");
 	use_external_cache = 1;
 
 	if (do_one_mempool_test(mp_nocache, 1) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_nocache, 2) < 0)
-		return -1;
+		goto err;
 
 	if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0)
-		return -1;
+		goto err;
 
 	rte_mempool_list_dump(stdout);
 
-	return 0;
+	ret = 0;
+
+err:
+	rte_mempool_free(mp_cache);
+	rte_mempool_free(mp_nocache);
+	rte_mempool_free(default_pool);
+	return ret;
 }
 
 REGISTER_TEST_COMMAND(mempool_perf_autotest, test_mempool_perf);