X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring.c;h=aaf1e70ad84150331e47acb83be7734701498ca8;hb=32941b5d52e4ef69b6fcf55765f4f1e8948494ab;hp=d6bb44b9f9fe28bb29ea90a88bd6cc019f3563b8;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git

diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index d6bb44b9f9..aaf1e70ad8 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -1,36 +1,5 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 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.
- * 
- *  version: DPDK.L.1.2.3-3
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
@@ -45,10 +14,8 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_memory.h>
-#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>
@@ -57,10 +24,8 @@
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_random.h>
-#include <rte_common.h>
 #include <rte_errno.h>
-
-#include <cmdline_parse.h>
+#include <rte_hexdump.h>
 
 #include "test.h"
 
@@ -82,502 +47,279 @@
  *      - Dequeue one object, two objects, MAX_BULK objects
  *      - Check that dequeued pointers are correct
  *
- *    - Test watermark and default bulk enqueue/dequeue:
- *
- *      - Set watermark
- *      - Set default bulk value
- *      - Enqueue objects, check that -EDQUOT is returned when
- *        watermark is exceeded
- *      - Check that dequeued pointers are correct
- *
- * #. Check quota and watermark
- *
- *    - Start a loop on another lcore that will enqueue and dequeue
- *      objects in a ring. It will monitor the value of quota (default
- *      bulk count) and watermark.
- *    - At the same time, change the quota and the watermark on the
- *      master lcore.
- *    - The slave lcore will check that bulk count changes from 4 to
- *      8, and watermark changes from 16 to 32.
- *
  * #. Performance tests.
  *
- *    This test is done on the following configurations:
- *
- *    - One core enqueuing, one core dequeuing
- *    - One core enqueuing, other cores dequeuing
- *    - One core dequeuing, other cores enqueuing
- *    - Half of the cores enqueuing, the other half dequeuing
- *
- *    When only one core enqueues/dequeues, the test is done with the
- *    SP/SC functions in addition to the MP/MC functions.
- *
- *    The test is done with different bulk size.
- *
- *    On each core, the test enqueues or dequeues objects during
- *    TIME_S seconds. The number of successes and failures are stored on
- *    each core, then summed and displayed.
- *
- *    The test checks that the number of enqueues is equal to the
- *    number of dequeues.
+ * Tests done in test_ring_perf.c
  */
 
 #define RING_SIZE 4096
 #define MAX_BULK 32
-#define N 65536
-#define TIME_S 5
 
 static rte_atomic32_t synchro;
 
-static unsigned bulk_enqueue;
-static unsigned bulk_dequeue;
-static struct rte_ring *r;
-
-struct test_stats {
-	unsigned enq_success ;
-	unsigned enq_quota;
-	unsigned enq_fail;
-
-	unsigned deq_success;
-	unsigned deq_fail;
-} __rte_cache_aligned;
-
-static struct test_stats test_stats[RTE_MAX_LCORE];
-
-#define DEFINE_ENQUEUE_FUNCTION(name, enq_code)			\
-static int							\
-name(__attribute__((unused)) void *arg)				\
-{								\
-	unsigned success = 0;					\
-	unsigned quota = 0;					\
-	unsigned fail = 0;					\
-	unsigned i;						\
-	unsigned long dummy_obj;				\
-	void *obj_table[MAX_BULK];				\
-	int ret;						\
-	unsigned lcore_id = rte_lcore_id();			\
-	uint64_t start_cycles, end_cycles;			\
-	uint64_t time_diff = 0, hz = rte_get_hpet_hz();		\
-								\
-	/* init dummy object table */				\
-	for (i = 0; i< MAX_BULK; i++) {				\
-		dummy_obj = lcore_id + 0x1000 + i;		\
-		obj_table[i] = (void *)dummy_obj;		\
-	}							\
-								\
-	/* wait synchro for slaves */				\
-	if (lcore_id != rte_get_master_lcore())			\
-		while (rte_atomic32_read(&synchro) == 0);	\
-								\
-	start_cycles = rte_get_hpet_cycles();			\
-								\
-	/* enqueue as many object as possible */		\
-	while (time_diff/hz < TIME_S) {				\
-		for (i = 0; likely(i < N); i++) {		\
-			ret = enq_code;				\
-			if (ret == 0)				\
-				success++;			\
-			else if (ret == -EDQUOT)		\
-				quota++;			\
-			else					\
-				fail++;				\
-		}						\
-		end_cycles = rte_get_hpet_cycles();		\
-		time_diff = end_cycles - start_cycles;		\
-	}							\
-								\
-	/* write statistics in a shared structure */		\
-	test_stats[lcore_id].enq_success = success;		\
-	test_stats[lcore_id].enq_quota = quota;			\
-	test_stats[lcore_id].enq_fail = fail;			\
-								\
-	return 0;						\
-}
-
-#define DEFINE_DEQUEUE_FUNCTION(name, deq_code)			\
-static int							\
-name(__attribute__((unused)) void *arg)				\
-{								\
-	unsigned success = 0;					\
-	unsigned fail = 0;					\
-	unsigned i;						\
-	void *obj_table[MAX_BULK];				\
-	int ret;						\
-	unsigned lcore_id = rte_lcore_id();			\
-	uint64_t start_cycles, end_cycles;			\
-	uint64_t time_diff = 0, hz = rte_get_hpet_hz();		\
-								\
-	/* wait synchro for slaves */				\
-	if (lcore_id != rte_get_master_lcore())			\
-		while (rte_atomic32_read(&synchro) == 0);	\
-								\
-	start_cycles = rte_get_hpet_cycles();			\
-								\
-	/* dequeue as many object as possible */		\
-	while (time_diff/hz < TIME_S) {				\
-		for (i = 0; likely(i < N); i++) {		\
-			ret = deq_code;				\
-			if (ret == 0)				\
-				success++;			\
-			else					\
-				fail++;				\
-		}						\
-		end_cycles = rte_get_hpet_cycles();		\
-		time_diff = end_cycles - start_cycles;		\
-	}							\
-								\
-	/* write statistics in a shared structure */		\
-	test_stats[lcore_id].deq_success = success;		\
-	test_stats[lcore_id].deq_fail = fail;			\
-								\
-	return 0;						\
-}
-
-DEFINE_ENQUEUE_FUNCTION(test_ring_per_core_sp_enqueue,
-			rte_ring_sp_enqueue_bulk(r, obj_table, bulk_enqueue))
-
-DEFINE_DEQUEUE_FUNCTION(test_ring_per_core_sc_dequeue,
-			rte_ring_sc_dequeue_bulk(r, obj_table, bulk_dequeue))
-
-DEFINE_ENQUEUE_FUNCTION(test_ring_per_core_mp_enqueue,
-			rte_ring_mp_enqueue_bulk(r, obj_table, bulk_enqueue))
-
-DEFINE_DEQUEUE_FUNCTION(test_ring_per_core_mc_dequeue,
-			rte_ring_mc_dequeue_bulk(r, obj_table, bulk_dequeue))
-
 #define	TEST_RING_VERIFY(exp)						\
 	if (!(exp)) {							\
 		printf("error at %s:%d\tcondition " #exp " failed\n",	\
 		    __func__, __LINE__);				\
-		rte_ring_dump(r);					\
-		return (-1);						\
+		rte_ring_dump(stdout, r);				\
+		return -1;						\
 	}
 
 #define	TEST_RING_FULL_EMTPY_ITER	8
 
-
+/*
+ * helper routine for test_ring_basic
+ */
 static int
-launch_cores(unsigned enq_core_count, unsigned deq_core_count, int sp, int sc)
+test_ring_basic_full_empty(struct rte_ring *r, void * const src[], void *dst[])
 {
-	void *obj;
-	unsigned lcore_id;
-	unsigned rate, deq_remain = 0;
-	unsigned enq_total, deq_total;
-	struct test_stats sum;
-	int (*enq_f)(void *);
-	int (*deq_f)(void *);
-	unsigned cores = enq_core_count + deq_core_count;
-	int ret;
+	unsigned i, rand;
+	const unsigned rsz = RING_SIZE - 1;
 
-	rte_atomic32_set(&synchro, 0);
-
-	printf("ring_autotest e/d_core=%u,%u e/d_bulk=%u,%u ",
-	       enq_core_count, deq_core_count, bulk_enqueue, bulk_dequeue);
-	printf("sp=%d sc=%d ", sp, sc);
-
-	/* set enqueue function to be used */
-	if (sp)
-		enq_f = test_ring_per_core_sp_enqueue;
-	else
-		enq_f = test_ring_per_core_mp_enqueue;
-
-	/* set dequeue function to be used */
-	if (sc)
-		deq_f = test_ring_per_core_sc_dequeue;
-	else
-		deq_f = test_ring_per_core_mc_dequeue;
-
-	RTE_LCORE_FOREACH_SLAVE(lcore_id) {
-		if (enq_core_count != 0) {
-			enq_core_count--;
-			rte_eal_remote_launch(enq_f, NULL, lcore_id);
-		}
-		if (deq_core_count != 1) {
-			deq_core_count--;
-			rte_eal_remote_launch(deq_f, NULL, lcore_id);
-		}
-	}
-
-	memset(test_stats, 0, sizeof(test_stats));
-
-	/* start synchro and launch test on master */
-	rte_atomic32_set(&synchro, 1);
-	ret = deq_f(NULL);
-
-	/* wait all cores */
-	RTE_LCORE_FOREACH_SLAVE(lcore_id) {
-		if (cores == 1)
-			break;
-		cores--;
-		if (rte_eal_wait_lcore(lcore_id) < 0)
-			ret = -1;
-	}
-
-	memset(&sum, 0, sizeof(sum));
-	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
-		sum.enq_success += test_stats[lcore_id].enq_success;
-		sum.enq_quota += test_stats[lcore_id].enq_quota;
-		sum.enq_fail += test_stats[lcore_id].enq_fail;
-		sum.deq_success += test_stats[lcore_id].deq_success;
-		sum.deq_fail += test_stats[lcore_id].deq_fail;
-	}
-
-	/* empty the ring */
-	while (rte_ring_sc_dequeue(r, &obj) == 0)
-		deq_remain += 1;
-
-	if (ret < 0) {
-		printf("per-lcore test returned -1\n");
-		return -1;
-	}
+	printf("Basic full/empty test\n");
 
-	enq_total = (sum.enq_success * bulk_enqueue) +
-		(sum.enq_quota * bulk_enqueue);
-	deq_total = (sum.deq_success * bulk_dequeue) + deq_remain;
+	for (i = 0; TEST_RING_FULL_EMTPY_ITER != i; i++) {
 
-	rate = deq_total/TIME_S;
+		/* random shift in the ring */
+		rand = RTE_MAX(rte_rand() % RING_SIZE, 1UL);
+		printf("%s: iteration %u, random shift: %u;\n",
+		    __func__, i, rand);
+		TEST_RING_VERIFY(rte_ring_enqueue_bulk(r, src, rand,
+				NULL) != 0);
+		TEST_RING_VERIFY(rte_ring_dequeue_bulk(r, dst, rand,
+				NULL) == rand);
 
-	printf("rate_persec=%u\n", rate);
+		/* fill the ring */
+		TEST_RING_VERIFY(rte_ring_enqueue_bulk(r, src, rsz, NULL) != 0);
+		TEST_RING_VERIFY(0 == rte_ring_free_count(r));
+		TEST_RING_VERIFY(rsz == rte_ring_count(r));
+		TEST_RING_VERIFY(rte_ring_full(r));
+		TEST_RING_VERIFY(0 == rte_ring_empty(r));
 
-	if (enq_total != deq_total) {
-		printf("invalid enq/deq_success counter: %u %u\n",
-		       enq_total, deq_total);
-		return -1;
-	}
+		/* empty the ring */
+		TEST_RING_VERIFY(rte_ring_dequeue_bulk(r, dst, rsz,
+				NULL) == rsz);
+		TEST_RING_VERIFY(rsz == rte_ring_free_count(r));
+		TEST_RING_VERIFY(0 == rte_ring_count(r));
+		TEST_RING_VERIFY(0 == rte_ring_full(r));
+		TEST_RING_VERIFY(rte_ring_empty(r));
 
+		/* check data */
+		TEST_RING_VERIFY(0 == memcmp(src, dst, rsz));
+		rte_ring_dump(stdout, r);
+	}
 	return 0;
 }
 
 static int
-do_one_ring_test2(unsigned enq_core_count, unsigned deq_core_count,
-		  unsigned n_enq_bulk, unsigned n_deq_bulk)
+test_ring_basic(struct rte_ring *r)
 {
-	int sp, sc;
-	int do_sp, do_sc;
+	void **src = NULL, **cur_src = NULL, **dst = NULL, **cur_dst = NULL;
 	int ret;
+	unsigned i, num_elems;
 
-	bulk_enqueue = n_enq_bulk;
-	bulk_dequeue = n_deq_bulk;
-
-	do_sp = (enq_core_count == 1) ? 1 : 0;
-	do_sc = (deq_core_count  == 1) ? 1 : 0;
+	/* alloc dummy object pointers */
+	src = malloc(RING_SIZE*2*sizeof(void *));
+	if (src == NULL)
+		goto fail;
 
-	for (sp = 0; sp <= do_sp; sp ++) {
-		for (sc = 0; sc <= do_sc; sc ++) {
-			ret = launch_cores(enq_core_count,
-					   deq_core_count,
-					   sp, sc);
-			if (ret < 0)
-				return -1;
-		}
+	for (i = 0; i < RING_SIZE*2 ; i++) {
+		src[i] = (void *)(unsigned long)i;
 	}
-	return 0;
-}
+	cur_src = src;
 
-static int
-do_one_ring_test(unsigned enq_core_count, unsigned deq_core_count)
-{
-	unsigned bulk_enqueue_tab[] = { 1, 2, 4, 32, 0 };
-	unsigned bulk_dequeue_tab[] = { 1, 2, 4, 32, 0 };
-	unsigned *bulk_enqueue_ptr;
-	unsigned *bulk_dequeue_ptr;
-	int ret;
+	/* alloc some room for copied objects */
+	dst = malloc(RING_SIZE*2*sizeof(void *));
+	if (dst == NULL)
+		goto fail;
 
-	for (bulk_enqueue_ptr = bulk_enqueue_tab;
-	     *bulk_enqueue_ptr;
-	     bulk_enqueue_ptr++) {
+	memset(dst, 0, RING_SIZE*2*sizeof(void *));
+	cur_dst = dst;
 
-		for (bulk_dequeue_ptr = bulk_dequeue_tab;
-		     *bulk_dequeue_ptr;
-		     bulk_dequeue_ptr++) {
+	printf("enqueue 1 obj\n");
+	ret = rte_ring_sp_enqueue_bulk(r, cur_src, 1, NULL);
+	cur_src += 1;
+	if (ret == 0)
+		goto fail;
 
-			ret = do_one_ring_test2(enq_core_count, deq_core_count,
-						*bulk_enqueue_ptr,
-						*bulk_dequeue_ptr);
-			if (ret < 0)
-				return -1;
-		}
-	}
-	return 0;
-}
+	printf("enqueue 2 objs\n");
+	ret = rte_ring_sp_enqueue_bulk(r, cur_src, 2, NULL);
+	cur_src += 2;
+	if (ret == 0)
+		goto fail;
 
-static int
-check_quota_and_watermark(__attribute__((unused)) void *dummy)
-{
-	uint64_t hz = rte_get_hpet_hz();
-	void *obj_table[MAX_BULK];
-	unsigned watermark, watermark_old = 16;
-	uint64_t cur_time, end_time;
-	int64_t diff = 0;
-	int i, ret;
-	unsigned quota, quota_old = 4;
-
-	/* init the object table */
-	memset(obj_table, 0, sizeof(obj_table));
-	end_time = rte_get_hpet_cycles() + (hz * 2);
-
-	/* check that bulk and watermark are 4 and 32 (respectively) */
-	while (diff >= 0) {
-
-		/* read quota, the only change allowed is from 4 to 8 */
-		quota = rte_ring_get_bulk_count(r);
-		if (quota != quota_old && (quota_old != 4 || quota != 8)) {
-			printf("Bad quota change %u -> %u\n", quota_old,
-			       quota);
-			return -1;
-		}
-		quota_old = quota;
-
-		/* add in ring until we reach watermark */
-		ret = 0;
-		for (i = 0; i < 16; i ++) {
-			if (ret != 0)
-				break;
-			ret = rte_ring_enqueue_bulk(r, obj_table, quota);
-		}
-
-		if (ret != -EDQUOT) {
-			printf("Cannot enqueue objects, or watermark not "
-			       "reached (ret=%d)\n", ret);
-			return -1;
-		}
-
-		/* read watermark, the only change allowed is from 16 to 32 */
-		watermark = i * quota;
-		if (watermark != watermark_old &&
-		    (watermark_old != 16 || watermark != 32)) {
-			printf("Bad watermark change %u -> %u\n", watermark_old,
-			       watermark);
-			return -1;
-		}
-		watermark_old = watermark;
-
-		/* dequeue objects from ring */
-		while (i--) {
-			ret = rte_ring_dequeue_bulk(r, obj_table, quota);
-			if (ret != 0) {
-				printf("Cannot dequeue (ret=%d)\n", ret);
-				return -1;
-			}
-		}
-
-		cur_time = rte_get_hpet_cycles();
-		diff = end_time - cur_time;
-	}
-
-	if (watermark_old != 32 || quota_old != 8) {
-		printf("quota or watermark was not updated (q=%u wm=%u)\n",
-		       quota_old, watermark_old);
-		return -1;
-	}
+	printf("enqueue MAX_BULK objs\n");
+	ret = rte_ring_sp_enqueue_bulk(r, cur_src, MAX_BULK, NULL);
+	cur_src += MAX_BULK;
+	if (ret == 0)
+		goto fail;
 
-	return 0;
-}
+	printf("dequeue 1 obj\n");
+	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, 1, NULL);
+	cur_dst += 1;
+	if (ret == 0)
+		goto fail;
 
-static int
-test_quota_and_watermark(void)
-{
-	unsigned lcore_id = rte_lcore_id();
-	unsigned lcore_id2 = rte_get_next_lcore(lcore_id, 0, 1);
+	printf("dequeue 2 objs\n");
+	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, 2, NULL);
+	cur_dst += 2;
+	if (ret == 0)
+		goto fail;
+
+	printf("dequeue MAX_BULK objs\n");
+	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, MAX_BULK, NULL);
+	cur_dst += MAX_BULK;
+	if (ret == 0)
+		goto fail;
 
-	printf("Test quota and watermark live modification\n");
+	/* check data */
+	if (memcmp(src, dst, cur_dst - dst)) {
+		rte_hexdump(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
+		printf("data after dequeue is not the same\n");
+		goto fail;
+	}
+	cur_src = src;
+	cur_dst = dst;
 
-	rte_ring_set_bulk_count(r, 4);
-	rte_ring_set_water_mark(r, 16);
+	printf("enqueue 1 obj\n");
+	ret = rte_ring_mp_enqueue_bulk(r, cur_src, 1, NULL);
+	cur_src += 1;
+	if (ret == 0)
+		goto fail;
 
-	/* launch a thread that will enqueue and dequeue, checking
-	 * watermark and quota */
-	rte_eal_remote_launch(check_quota_and_watermark, NULL, lcore_id2);
+	printf("enqueue 2 objs\n");
+	ret = rte_ring_mp_enqueue_bulk(r, cur_src, 2, NULL);
+	cur_src += 2;
+	if (ret == 0)
+		goto fail;
 
-	rte_delay_ms(1000);
-	rte_ring_set_bulk_count(r, 8);
-	rte_ring_set_water_mark(r, 32);
-	rte_delay_ms(1000);
+	printf("enqueue MAX_BULK objs\n");
+	ret = rte_ring_mp_enqueue_bulk(r, cur_src, MAX_BULK, NULL);
+	cur_src += MAX_BULK;
+	if (ret == 0)
+		goto fail;
 
-	if (rte_eal_wait_lcore(lcore_id2) < 0)
-		return -1;
+	printf("dequeue 1 obj\n");
+	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, 1, NULL);
+	cur_dst += 1;
+	if (ret == 0)
+		goto fail;
 
-	return 0;
-}
-/* Test for catch on invalid watermark values */
-static int
-test_set_watermark( void ){
-	unsigned count;
-	int setwm;
+	printf("dequeue 2 objs\n");
+	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, 2, NULL);
+	cur_dst += 2;
+	if (ret == 0)
+		goto fail;
 
-	struct rte_ring *r = rte_ring_lookup("test_ring_basic_ex");
-	if(r == NULL){
-		printf( " ring lookup failed\n" );
-		goto error;
+	printf("dequeue MAX_BULK objs\n");
+	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, MAX_BULK, NULL);
+	cur_dst += MAX_BULK;
+	if (ret == 0)
+		goto fail;
+
+	/* check data */
+	if (memcmp(src, dst, cur_dst - dst)) {
+		rte_hexdump(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
+		printf("data after dequeue is not the same\n");
+		goto fail;
 	}
-	count = r->prod.size*2;
-	setwm = rte_ring_set_water_mark(r, count);
-	if (setwm != -EINVAL){
-		printf("Test failed to detect invalid watermark count value\n");
-		goto error;
+	cur_src = src;
+	cur_dst = dst;
+
+	printf("fill and empty the ring\n");
+	for (i = 0; i<RING_SIZE/MAX_BULK; i++) {
+		ret = rte_ring_mp_enqueue_bulk(r, cur_src, MAX_BULK, NULL);
+		cur_src += MAX_BULK;
+		if (ret == 0)
+			goto fail;
+		ret = rte_ring_mc_dequeue_bulk(r, cur_dst, MAX_BULK, NULL);
+		cur_dst += MAX_BULK;
+		if (ret == 0)
+			goto fail;
 	}
 
-	count = 0;
-	setwm = 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;
+	/* check data */
+	if (memcmp(src, dst, cur_dst - dst)) {
+		rte_hexdump(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
+		printf("data after dequeue is not the same\n");
+		goto fail;
 	}
-	return 0;
 
-error:
-	return -1;
-}
+	if (test_ring_basic_full_empty(r, src, dst) != 0)
+		goto fail;
 
-/*
- * helper routine for test_ring_basic
- */
-static int
-test_ring_basic_full_empty(void * const src[], void *dst[])
-{
-	unsigned i, rand;
-	const unsigned rsz = RING_SIZE - 1;
+	cur_src = src;
+	cur_dst = dst;
 
-	printf("Basic full/empty test\n");
+	printf("test default bulk enqueue / dequeue\n");
+	num_elems = 16;
 
-	for (i = 0; TEST_RING_FULL_EMTPY_ITER != i; i++) {
+	cur_src = src;
+	cur_dst = dst;
 
-		/* random shift in the ring */
-		rand = RTE_MAX(rte_rand() % RING_SIZE, 1UL);
-		printf("%s: iteration %u, random shift: %u;\n",
-		    __func__, i, rand);
-		TEST_RING_VERIFY(-ENOBUFS != rte_ring_enqueue_bulk(r, src,
-		    rand));
-		TEST_RING_VERIFY(0 == rte_ring_dequeue_bulk(r, dst, rand));
+	ret = rte_ring_enqueue_bulk(r, cur_src, num_elems, NULL);
+	cur_src += num_elems;
+	if (ret == 0) {
+		printf("Cannot enqueue\n");
+		goto fail;
+	}
+	ret = rte_ring_enqueue_bulk(r, cur_src, num_elems, NULL);
+	cur_src += num_elems;
+	if (ret == 0) {
+		printf("Cannot enqueue\n");
+		goto fail;
+	}
+	ret = rte_ring_dequeue_bulk(r, cur_dst, num_elems, NULL);
+	cur_dst += num_elems;
+	if (ret == 0) {
+		printf("Cannot dequeue\n");
+		goto fail;
+	}
+	ret = rte_ring_dequeue_bulk(r, cur_dst, num_elems, NULL);
+	cur_dst += num_elems;
+	if (ret == 0) {
+		printf("Cannot dequeue2\n");
+		goto fail;
+	}
 
-		/* fill the ring */
-		TEST_RING_VERIFY(-ENOBUFS != rte_ring_enqueue_bulk(r, src,
-		    rsz));
-		TEST_RING_VERIFY(0 == rte_ring_free_count(r));
-		TEST_RING_VERIFY(rsz == rte_ring_count(r));
-		TEST_RING_VERIFY(rte_ring_full(r));
-		TEST_RING_VERIFY(0 == rte_ring_empty(r));
+	/* check data */
+	if (memcmp(src, dst, cur_dst - dst)) {
+		rte_hexdump(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
+		printf("data after dequeue is not the same\n");
+		goto fail;
+	}
 
-		/* empty the ring */
-		TEST_RING_VERIFY(0 == rte_ring_dequeue_bulk(r, dst, rsz));
-		TEST_RING_VERIFY(rsz == rte_ring_free_count(r));
-		TEST_RING_VERIFY(0 == rte_ring_count(r));
-		TEST_RING_VERIFY(0 == rte_ring_full(r));
-		TEST_RING_VERIFY(rte_ring_empty(r));
+	cur_src = src;
+	cur_dst = dst;
 
-		/* check data */
-		TEST_RING_VERIFY(0 == memcmp(src, dst, rsz));
-		rte_ring_dump(r);
-	}
-	return (0);
+	ret = rte_ring_mp_enqueue(r, cur_src);
+	if (ret != 0)
+		goto fail;
+
+	ret = rte_ring_mc_dequeue(r, cur_dst);
+	if (ret != 0)
+		goto fail;
+
+	free(src);
+	free(dst);
+	return 0;
+
+ fail:
+	free(src);
+	free(dst);
+	return -1;
 }
 
 static int
-test_ring_basic(void)
+test_ring_burst_basic(struct rte_ring *r)
 {
 	void **src = NULL, **cur_src = NULL, **dst = NULL, **cur_dst = NULL;
 	int ret;
-	unsigned i, n;
+	unsigned i;
 
 	/* alloc dummy object pointers */
 	src = malloc(RING_SIZE*2*sizeof(void *));
@@ -597,182 +339,261 @@ test_ring_basic(void)
 	memset(dst, 0, RING_SIZE*2*sizeof(void *));
 	cur_dst = dst;
 
+	printf("Test SP & SC basic functions \n");
 	printf("enqueue 1 obj\n");
-	ret = rte_ring_sp_enqueue_bulk(r, cur_src, 1);
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, 1, NULL);
 	cur_src += 1;
-	if (ret != 0)
+	if (ret != 1)
 		goto fail;
 
 	printf("enqueue 2 objs\n");
-	ret = rte_ring_sp_enqueue_bulk(r, cur_src, 2);
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, 2, NULL);
 	cur_src += 2;
-	if (ret != 0)
+	if (ret != 2)
 		goto fail;
 
 	printf("enqueue MAX_BULK objs\n");
-	ret = rte_ring_sp_enqueue_bulk(r, cur_src, MAX_BULK);
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
 	cur_src += MAX_BULK;
-	if (ret != 0)
+	if (ret != MAX_BULK)
 		goto fail;
 
 	printf("dequeue 1 obj\n");
-	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, 1);
+	ret = rte_ring_sc_dequeue_burst(r, cur_dst, 1, NULL);
 	cur_dst += 1;
-	if (ret != 0)
+	if (ret != 1)
 		goto fail;
 
 	printf("dequeue 2 objs\n");
-	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, 2);
+	ret = rte_ring_sc_dequeue_burst(r, cur_dst, 2, NULL);
 	cur_dst += 2;
-	if (ret != 0)
+	if (ret != 2)
 		goto fail;
 
 	printf("dequeue MAX_BULK objs\n");
-	ret = rte_ring_sc_dequeue_bulk(r, cur_dst, MAX_BULK);
+	ret = rte_ring_sc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
 	cur_dst += MAX_BULK;
+	if (ret != MAX_BULK)
+		goto fail;
+
+	/* check data */
+	if (memcmp(src, dst, cur_dst - dst)) {
+		rte_hexdump(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
+		printf("data after dequeue is not the same\n");
+		goto fail;
+	}
+
+	cur_src = src;
+	cur_dst = dst;
+
+	printf("Test enqueue without enough memory space \n");
+	for (i = 0; i< (RING_SIZE/MAX_BULK - 1); i++) {
+		ret = rte_ring_sp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
+		cur_src += MAX_BULK;
+		if (ret != MAX_BULK)
+			goto fail;
+	}
+
+	printf("Enqueue 2 objects, free entries = MAX_BULK - 2  \n");
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, 2, NULL);
+	cur_src += 2;
+	if (ret != 2)
+		goto fail;
+
+	printf("Enqueue the remaining entries = MAX_BULK - 2  \n");
+	/* Always one free entry left */
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
+	cur_src += MAX_BULK - 3;
+	if (ret != MAX_BULK - 3)
+		goto fail;
+
+	printf("Test if ring is full  \n");
+	if (rte_ring_full(r) != 1)
+		goto fail;
+
+	printf("Test enqueue for a full entry  \n");
+	ret = rte_ring_sp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
 	if (ret != 0)
 		goto fail;
 
+	printf("Test dequeue without enough objects \n");
+	for (i = 0; i<RING_SIZE/MAX_BULK - 1; i++) {
+		ret = rte_ring_sc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
+		cur_dst += MAX_BULK;
+		if (ret != MAX_BULK)
+			goto fail;
+	}
+
+	/* Available memory space for the exact MAX_BULK entries */
+	ret = rte_ring_sc_dequeue_burst(r, cur_dst, 2, NULL);
+	cur_dst += 2;
+	if (ret != 2)
+		goto fail;
+
+	ret = rte_ring_sc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
+	cur_dst += MAX_BULK - 3;
+	if (ret != MAX_BULK - 3)
+		goto fail;
+
+	printf("Test if ring is empty \n");
+	/* Check if ring is empty */
+	if (1 != rte_ring_empty(r))
+		goto fail;
+
 	/* 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(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
+
 	cur_src = src;
 	cur_dst = dst;
 
+	printf("Test MP & MC basic functions \n");
+
 	printf("enqueue 1 obj\n");
-	ret = rte_ring_mp_enqueue_bulk(r, cur_src, 1);
+	ret = rte_ring_mp_enqueue_burst(r, cur_src, 1, NULL);
 	cur_src += 1;
-	if (ret != 0)
+	if (ret != 1)
 		goto fail;
 
 	printf("enqueue 2 objs\n");
-	ret = rte_ring_mp_enqueue_bulk(r, cur_src, 2);
+	ret = rte_ring_mp_enqueue_burst(r, cur_src, 2, NULL);
 	cur_src += 2;
-	if (ret != 0)
+	if (ret != 2)
 		goto fail;
 
 	printf("enqueue MAX_BULK objs\n");
-	ret = rte_ring_mp_enqueue_bulk(r, cur_src, MAX_BULK);
+	ret = rte_ring_mp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
 	cur_src += MAX_BULK;
-	if (ret != 0)
+	if (ret != MAX_BULK)
 		goto fail;
 
 	printf("dequeue 1 obj\n");
-	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, 1);
+	ret = rte_ring_mc_dequeue_burst(r, cur_dst, 1, NULL);
 	cur_dst += 1;
-	if (ret != 0)
+	if (ret != 1)
 		goto fail;
 
 	printf("dequeue 2 objs\n");
-	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, 2);
+	ret = rte_ring_mc_dequeue_burst(r, cur_dst, 2, NULL);
 	cur_dst += 2;
-	if (ret != 0)
+	if (ret != 2)
 		goto fail;
 
 	printf("dequeue MAX_BULK objs\n");
-	ret = rte_ring_mc_dequeue_bulk(r, cur_dst, MAX_BULK);
+	ret = rte_ring_mc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
 	cur_dst += MAX_BULK;
-	if (ret != 0)
+	if (ret != MAX_BULK)
 		goto fail;
 
 	/* 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(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
+
 	cur_src = src;
 	cur_dst = dst;
 
 	printf("fill and empty the ring\n");
 	for (i = 0; i<RING_SIZE/MAX_BULK; i++) {
-		ret = rte_ring_mp_enqueue_bulk(r, cur_src, MAX_BULK);
+		ret = rte_ring_mp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
 		cur_src += MAX_BULK;
-		if (ret != 0)
+		if (ret != MAX_BULK)
 			goto fail;
-		ret = rte_ring_mc_dequeue_bulk(r, cur_dst, MAX_BULK);
+		ret = rte_ring_mc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
 		cur_dst += MAX_BULK;
-		if (ret != 0)
+		if (ret != MAX_BULK)
 			goto fail;
 	}
 
 	/* 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(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
 
-	if (test_ring_basic_full_empty(src, dst) != 0)
-		goto fail;
-
 	cur_src = src;
 	cur_dst = dst;
 
-	printf("test watermark and default bulk enqueue / dequeue\n");
-	rte_ring_set_bulk_count(r, 16);
-	rte_ring_set_water_mark(r, 20);
-	n = rte_ring_get_bulk_count(r);
-	if (n != 16) {
-		printf("rte_ring_get_bulk_count() returned %u instead "
-		       "of 16\n", n);
-		goto fail;
+	printf("Test enqueue without enough memory space \n");
+	for (i = 0; i<RING_SIZE/MAX_BULK - 1; i++) {
+		ret = rte_ring_mp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
+		cur_src += MAX_BULK;
+		if (ret != MAX_BULK)
+			goto fail;
 	}
 
-	cur_src = src;
-	cur_dst = dst;
-	ret = rte_ring_enqueue_bulk(r, cur_src, n);
-	cur_src += 16;
-	if (ret != 0) {
-		printf("Cannot enqueue\n");
+	/* Available memory space for the exact MAX_BULK objects */
+	ret = rte_ring_mp_enqueue_burst(r, cur_src, 2, NULL);
+	cur_src += 2;
+	if (ret != 2)
 		goto fail;
-	}
-	ret = rte_ring_enqueue_bulk(r, cur_src, n);
-	cur_src += 16;
-	if (ret != -EDQUOT) {
-		printf("Watermark not exceeded\n");
+
+	ret = rte_ring_mp_enqueue_burst(r, cur_src, MAX_BULK, NULL);
+	cur_src += MAX_BULK - 3;
+	if (ret != MAX_BULK - 3)
 		goto fail;
+
+
+	printf("Test dequeue without enough objects \n");
+	for (i = 0; i<RING_SIZE/MAX_BULK - 1; i++) {
+		ret = rte_ring_mc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
+		cur_dst += MAX_BULK;
+		if (ret != MAX_BULK)
+			goto fail;
 	}
-	ret = rte_ring_dequeue_bulk(r, cur_dst, n);
-	cur_dst += 16;
-	if (ret != 0) {
-		printf("Cannot dequeue\n");
+
+	/* Available objects - the exact MAX_BULK */
+	ret = rte_ring_mc_dequeue_burst(r, cur_dst, 2, NULL);
+	cur_dst += 2;
+	if (ret != 2)
 		goto fail;
-	}
-	ret = rte_ring_dequeue_bulk(r, cur_dst, n);
-	cur_dst += 16;
-	if (ret != 0) {
-		printf("Cannot dequeue2\n");
+
+	ret = rte_ring_mc_dequeue_burst(r, cur_dst, MAX_BULK, NULL);
+	cur_dst += MAX_BULK - 3;
+	if (ret != MAX_BULK - 3)
 		goto fail;
-	}
 
 	/* 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(stdout, "src", src, cur_src - src);
+		rte_hexdump(stdout, "dst", dst, cur_dst - dst);
 		printf("data after dequeue is not the same\n");
 		goto fail;
 	}
+
 	cur_src = src;
 	cur_dst = dst;
 
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	printf("Covering rte_ring_enqueue_burst functions \n");
+
+	ret = rte_ring_enqueue_burst(r, cur_src, 2, NULL);
+	cur_src += 2;
+	if (ret != 2)
+		goto fail;
+
+	ret = rte_ring_dequeue_burst(r, cur_dst, 2, NULL);
+	cur_dst += 2;
+	if (ret != 2)
+		goto fail;
+
+	/* Free memory before test completed */
+	free(src);
+	free(dst);
 	return 0;
 
  fail:
-	if (src)
-		free(src);
-	if (dst)
-		free(dst);
+	free(src);
+	free(dst);
 	return -1;
 }
 
@@ -784,11 +605,17 @@ test_ring_creation_with_wrong_size(void)
 {
 	struct rte_ring * rp = NULL;
 
-	rp = rte_ring_create("test_bad_ring_size", RING_SIZE+1, SOCKET_ID_ANY, 0);
+	/* Test if ring size is not power of 2 */
+	rp = rte_ring_create("test_bad_ring_size", RING_SIZE + 1, SOCKET_ID_ANY, 0);
 	if (NULL != rp) {
 		return -1;
 	}
 
+	/* Test if ring size is exceeding the limit */
+	rp = rte_ring_create("test_bad_ring_size", (RTE_RING_SZ_MASK + 1), SOCKET_ID_ANY, 0);
+	if (NULL != rp) {
+		return -1;
+	}
 	return 0;
 }
 
@@ -842,16 +669,17 @@ test_ring_basic_ex(void)
 {
 	int ret = -1;
 	unsigned i;
-	struct rte_ring * rp;
+	struct rte_ring *rp = NULL;
 	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;
 	}
 
-	rp = rte_ring_create("test_ring_basic_ex", RING_SIZE, SOCKET_ID_ANY, 0);
+	rp = rte_ring_create("test_ring_basic_ex", RING_SIZE, SOCKET_ID_ANY,
+			RING_F_SP_ENQ | RING_F_SC_DEQ);
 	if (rp == NULL) {
 		printf("test_ring_basic_ex fail to create ring\n");
 		goto fail_test;
@@ -886,102 +714,163 @@ test_ring_basic_ex(void)
 		goto fail_test;
 	}
 
+	/* Covering the ring burst operation */
+	ret = rte_ring_enqueue_burst(rp, obj, 2, NULL);
+	if (ret != 2) {
+		printf("test_ring_basic_ex: rte_ring_enqueue_burst fails \n");
+		goto fail_test;
+	}
+
+	ret = rte_ring_dequeue_burst(rp, obj, 2, NULL);
+	if (ret != 2) {
+		printf("test_ring_basic_ex: rte_ring_dequeue_burst fails \n");
+		goto fail_test;
+	}
+
 	ret = 0;
 fail_test:
+	rte_ring_free(rp);
 	if (obj != NULL)
 		rte_free(obj);
 
 	return ret;
 }
 
-int
+static int
+test_ring_with_exact_size(void)
+{
+	struct rte_ring *std_ring = NULL, *exact_sz_ring = NULL;
+	void *ptr_array[16];
+	static const unsigned int ring_sz = RTE_DIM(ptr_array);
+	unsigned int i;
+	int ret = -1;
+
+	std_ring = rte_ring_create("std", ring_sz, rte_socket_id(),
+			RING_F_SP_ENQ | RING_F_SC_DEQ);
+	if (std_ring == NULL) {
+		printf("%s: error, can't create std ring\n", __func__);
+		goto end;
+	}
+	exact_sz_ring = rte_ring_create("exact sz", ring_sz, rte_socket_id(),
+			RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
+	if (exact_sz_ring == NULL) {
+		printf("%s: error, can't create exact size ring\n", __func__);
+		goto end;
+	}
+
+	/*
+	 * Check that the exact size ring is bigger than the standard ring
+	 */
+	if (rte_ring_get_size(std_ring) >= rte_ring_get_size(exact_sz_ring)) {
+		printf("%s: error, std ring (size: %u) is not smaller than exact size one (size %u)\n",
+				__func__,
+				rte_ring_get_size(std_ring),
+				rte_ring_get_size(exact_sz_ring));
+		goto end;
+	}
+	/*
+	 * check that the exact_sz_ring can hold one more element than the
+	 * standard ring. (16 vs 15 elements)
+	 */
+	for (i = 0; i < ring_sz - 1; i++) {
+		rte_ring_enqueue(std_ring, NULL);
+		rte_ring_enqueue(exact_sz_ring, NULL);
+	}
+	if (rte_ring_enqueue(std_ring, NULL) != -ENOBUFS) {
+		printf("%s: error, unexpected successful enqueue\n", __func__);
+		goto end;
+	}
+	if (rte_ring_enqueue(exact_sz_ring, NULL) == -ENOBUFS) {
+		printf("%s: error, enqueue failed\n", __func__);
+		goto end;
+	}
+
+	/* check that dequeue returns the expected number of elements */
+	if (rte_ring_dequeue_burst(exact_sz_ring, ptr_array,
+			RTE_DIM(ptr_array), NULL) != ring_sz) {
+		printf("%s: error, failed to dequeue expected nb of elements\n",
+				__func__);
+		goto end;
+	}
+
+	/* check that the capacity function returns expected value */
+	if (rte_ring_get_capacity(exact_sz_ring) != ring_sz) {
+		printf("%s: error, incorrect ring capacity reported\n",
+				__func__);
+		goto end;
+	}
+
+	ret = 0; /* all ok if we get here */
+end:
+	rte_ring_free(std_ring);
+	rte_ring_free(exact_sz_ring);
+	return ret;
+}
+
+static int
 test_ring(void)
 {
-	unsigned enq_core_count, deq_core_count;
+	struct rte_ring *r = NULL;
 
 	/* some more basic operations */
 	if (test_ring_basic_ex() < 0)
-		return -1;
+		goto test_fail;
 
 	rte_atomic32_init(&synchro);
 
+	r = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, 0);
 	if (r == NULL)
-		r = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, 0);
-	if (r == NULL)
-		return -1;
+		goto test_fail;
 
 	/* retrieve the ring from its name */
 	if (rte_ring_lookup("test") != r) {
 		printf("Cannot lookup ring from its name\n");
-		return -1;
+		goto test_fail;
 	}
 
-	/* basic operations */
-	if (test_ring_basic() < 0)
-		return -1;
+	/* burst operations */
+	if (test_ring_burst_basic(r) < 0)
+		goto test_fail;
 
 	/* basic operations */
-	if (test_quota_and_watermark() < 0)
-		return -1;
-
-	if ( test_set_watermark() < 0){
-		printf ("Test failed to detect invalid parameter\n");
-		return -1;
-	}
-	else
-		printf ( "Test detected forced bad watermark values\n");
+	if (test_ring_basic(r) < 0)
+		goto test_fail;
 
+	/* basic operations */
 	if ( test_create_count_odd() < 0){
-			printf ("Test failed to detect odd count\n");
-			return -1;
-		}
-		else
-			printf ( "Test detected odd count\n");
+		printf("Test failed to detect odd count\n");
+		goto test_fail;
+	} else
+		printf("Test detected odd count\n");
 
 	if ( test_lookup_null() < 0){
-				printf ("Test failed to detect NULL ring lookup\n");
-				return -1;
-			}
-			else
-				printf ( "Test detected NULL ring lookup \n");
-
-
-	printf("start performance tests\n");
-
-	/* one lcore for enqueue, one for dequeue */
-	enq_core_count = 1;
-	deq_core_count = 1;
-	if (do_one_ring_test(enq_core_count, deq_core_count) < 0)
-		return -1;
-
-	/* max cores for enqueue, one for dequeue */
-	enq_core_count = rte_lcore_count() - 1;
-	deq_core_count = 1;
-	if (do_one_ring_test(enq_core_count, deq_core_count) < 0)
-		return -1;
-
-	/* max cores for dequeue, one for enqueue */
-	enq_core_count = 1;
-	deq_core_count = rte_lcore_count() - 1;
-	if (do_one_ring_test(enq_core_count, deq_core_count) < 0)
-		return -1;
-
-	/* half for enqueue and half for dequeue */
-	enq_core_count = rte_lcore_count() / 2;
-	deq_core_count = rte_lcore_count() / 2;
-	if (do_one_ring_test(enq_core_count, deq_core_count) < 0)
-		return -1;
+		printf("Test failed to detect NULL ring lookup\n");
+		goto test_fail;
+	} else
+		printf("Test detected NULL ring lookup\n");
 
 	/* test of creating ring with wrong size */
 	if (test_ring_creation_with_wrong_size() < 0)
-		return -1;
+		goto test_fail;
 
 	/* test of creation ring with an used name */
 	if (test_ring_creation_with_an_used_name() < 0)
-		return -1;
+		goto test_fail;
+
+	if (test_ring_with_exact_size() < 0)
+		goto test_fail;
 
 	/* dump the ring status */
-	rte_ring_list_dump();
+	rte_ring_list_dump(stdout);
+
+	rte_ring_free(r);
 
 	return 0;
+
+test_fail:
+	rte_ring_free(r);
+
+	return -1;
 }
+
+REGISTER_TEST_COMMAND(ring_autotest, test_ring);