X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring.c;h=0d7523ed49df0d3a1a048a9a005448c39fbe1e3b;hb=693f715da45c48ec1ec0fe4ba2f3b5ffd11ba53e;hp=be588f26772a2e5534fe35505c944e54bda56dde;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git

diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index be588f2677..0d7523ed49 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -46,7 +46,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>
@@ -113,7 +112,7 @@ static struct rte_ring *r;
 		printf("error at %s:%d\tcondition " #exp " failed\n",	\
 		    __func__, __LINE__);				\
 		rte_ring_dump(stdout, r);				\
-		return (-1);						\
+		return -1;						\
 	}
 
 #define	TEST_RING_FULL_EMTPY_ITER	8
@@ -275,7 +274,7 @@ test_ring_basic_full_empty(void * const src[], void *dst[])
 		TEST_RING_VERIFY(0 == memcmp(src, dst, rsz));
 		rte_ring_dump(stdout, r);
 	}
-	return (0);
+	return 0;
 }
 
 static int
@@ -472,17 +471,13 @@ test_ring_basic(void)
 	if (ret != 0)
 		goto fail;
 
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return 0;
 
  fail:
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return -1;
 }
 
@@ -760,17 +755,13 @@ test_ring_burst_basic(void)
 		goto fail;
 
 	/* Free memory before test completed */
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return 0;
 
  fail:
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return -1;
 }
 
@@ -1169,17 +1160,13 @@ test_ring_stats(void)
 	memset(&r->stats[lcore_id], 0, sizeof(r->stats[lcore_id]));
 
 	/* Free memory before test completed */
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return 0;
 
 fail:
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return -1;
 #endif
 }
@@ -1259,7 +1246,7 @@ test_ring_basic_ex(void)
 	struct rte_ring * rp;
 	void **obj = NULL;
 
-	obj = (void **)rte_zmalloc("test_ring_basic_ex_malloc", (RING_SIZE * sizeof(void *)), 0);
+	obj = rte_calloc("test_ring_basic_ex_malloc", RING_SIZE, sizeof(void *), 0);
 	if (obj == NULL) {
 		printf("test_ring_basic_ex fail to rte_malloc\n");
 		goto fail_test;
@@ -1322,7 +1309,7 @@ fail_test:
 	return ret;
 }
 
-int
+static int
 test_ring(void)
 {
 	/* some more basic operations */
@@ -1392,3 +1379,9 @@ test_ring(void)
 
 	return 0;
 }
+
+static struct test_command ring_cmd = {
+	.command = "ring_autotest",
+	.callback = test_ring,
+};
+REGISTER_TEST_COMMAND(ring_cmd);