X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_ring.c;h=2699e1ef13ddd16896e98bbe70049ba70cdeaac1;hb=d7937e2e3d12e326b86248a42f95825db53c8b4f;hp=9a07479dbed43bed8b77c75737aa3a64e5e9f381;hpb=50d769054872d8c43e7cb66119e5387ca53deb90;p=dpdk.git

diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index 9a07479dbe..2699e1ef13 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -58,6 +58,7 @@
 #include <rte_random.h>
 #include <rte_common.h>
 #include <rte_errno.h>
+#include <rte_hexdump.h>
 
 #include <cmdline_parse.h>
 
@@ -579,7 +580,7 @@ test_set_watermark( void ){
 	}
 
 	count = 0;
-	setwm = rte_ring_set_water_mark(r, count);
+	rte_ring_set_water_mark(r, count);
 	if (r->prod.watermark != r->prod.size) {
 		printf("Test failed to detect invalid watermark count value\n");
 		goto error;
@@ -696,8 +697,8 @@ test_ring_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -742,8 +743,8 @@ test_ring_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -764,8 +765,8 @@ test_ring_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -810,8 +811,8 @@ test_ring_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -820,18 +821,13 @@ test_ring_basic(void)
 	cur_dst = dst;
 
 	ret = rte_ring_mp_enqueue(r, cur_src);
-	cur_src += 1;
 	if (ret != 0)
 		goto fail;
 
 	ret = rte_ring_mc_dequeue(r, cur_dst);
-	cur_dst += 1;
 	if (ret != 0)
 		goto fail;
 
-	cur_src = src;
-	cur_dst = dst;
-
 	if (src)
 		free(src);
 	if (dst)
@@ -910,8 +906,8 @@ test_ring_burst_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -976,8 +972,8 @@ test_ring_burst_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -1025,8 +1021,8 @@ test_ring_burst_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -1048,8 +1044,8 @@ test_ring_burst_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
@@ -1098,8 +1094,8 @@ test_ring_burst_basic(void)
 
 	/* check data */
 	if (memcmp(src, dst, cur_dst - dst)) {
-		test_hexdump("src", src, cur_src - src);
-		test_hexdump("dst", dst, cur_dst - dst);
+		rte_hexdump("src", src, cur_src - src);
+		rte_hexdump("dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}