ring_nb_autotest re-uses the ring_autotest code by wrapping its top-level
function with one that takes a 'flags' argument.
Signed-off-by: Gage Eads <gage.e...@intel.com>
---
test/test/test_ring.c | 57 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/test/test/test_ring.c b/test/test/test_ring.c
index aaf1e70ad..ff410d978 100644
--- a/test/test/test_ring.c
+++ b/test/test/test_ring.c
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 2010-2019 Intel Corporation
*/
#include <string.h>
@@ -601,18 +601,20 @@ test_ring_burst_basic(struct rte_ring *r)
* it will always fail to create ring with a wrong ring size number in this
function
*/
static int
-test_ring_creation_with_wrong_size(void)
+test_ring_creation_with_wrong_size(unsigned int flags)
{
struct rte_ring * rp = NULL;
/* Test if ring size is not power of 2 */
- rp = rte_ring_create("test_bad_ring_size", RING_SIZE + 1,
SOCKET_ID_ANY, 0);
+ rp = rte_ring_create("test_bad_ring_size", RING_SIZE + 1,
+ SOCKET_ID_ANY, flags);
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);
+ rp = rte_ring_create("test_bad_ring_size", (RTE_RING_SZ_MASK + 1),
+ SOCKET_ID_ANY, flags);
if (NULL != rp) {
return -1;
}
@@ -623,11 +625,11 @@ test_ring_creation_with_wrong_size(void)
* it tests if it would always fail to create ring with an used ring name
*/
static int
-test_ring_creation_with_an_used_name(void)
+test_ring_creation_with_an_used_name(unsigned int flags)
{
struct rte_ring * rp;
- rp = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, 0);
+ rp = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, flags);
if (NULL != rp)
return -1;
@@ -639,10 +641,10 @@ test_ring_creation_with_an_used_name(void)
* function to fail correctly
*/
static int
-test_create_count_odd(void)
+test_create_count_odd(unsigned int flags)
{
struct rte_ring *r = rte_ring_create("test_ring_count",
- 4097, SOCKET_ID_ANY, 0 );
+ 4097, SOCKET_ID_ANY, flags);
if(r != NULL){
return -1;
}
@@ -665,7 +667,7 @@ test_lookup_null(void)
* it tests some more basic ring operations
*/
static int
-test_ring_basic_ex(void)
+test_ring_basic_ex(unsigned int flags)
{
int ret = -1;
unsigned i;
@@ -679,7 +681,7 @@ test_ring_basic_ex(void)
}
rp = rte_ring_create("test_ring_basic_ex", RING_SIZE, SOCKET_ID_ANY,
- RING_F_SP_ENQ | RING_F_SC_DEQ);
+ RING_F_SP_ENQ | RING_F_SC_DEQ | flags);
if (rp == NULL) {
printf("test_ring_basic_ex fail to create ring\n");
goto fail_test;
@@ -737,7 +739,7 @@ test_ring_basic_ex(void)
}
static int
-test_ring_with_exact_size(void)
+test_ring_with_exact_size(unsigned int flags)
{
struct rte_ring *std_ring = NULL, *exact_sz_ring = NULL;
void *ptr_array[16];
@@ -746,13 +748,13 @@ test_ring_with_exact_size(void)
int ret = -1;
std_ring = rte_ring_create("std", ring_sz, rte_socket_id(),
- RING_F_SP_ENQ | RING_F_SC_DEQ);
+ RING_F_SP_ENQ | RING_F_SC_DEQ | flags);
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);
+ RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ | flags);
if (exact_sz_ring == NULL) {
printf("%s: error, can't create exact size ring\n", __func__);
goto end;
@@ -808,17 +810,17 @@ test_ring_with_exact_size(void)
}
static int
-test_ring(void)
+__test_ring(unsigned int flags)
{
struct rte_ring *r = NULL;
/* some more basic operations */
- if (test_ring_basic_ex() < 0)
+ if (test_ring_basic_ex(flags) < 0)
goto test_fail;
rte_atomic32_init(&synchro);
- r = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, 0);
+ r = rte_ring_create("test", RING_SIZE, SOCKET_ID_ANY, flags);
if (r == NULL)
goto test_fail;
@@ -837,27 +839,27 @@ test_ring(void)
goto test_fail;
/* basic operations */
- if ( test_create_count_odd() < 0){
+ if (test_create_count_odd(flags) < 0) {
printf("Test failed to detect odd count\n");
goto test_fail;
} else
printf("Test detected odd count\n");
- if ( test_lookup_null() < 0){
+ if (test_lookup_null() < 0) {
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)
+ if (test_ring_creation_with_wrong_size(flags) < 0)
goto test_fail;
/* test of creation ring with an used name */
- if (test_ring_creation_with_an_used_name() < 0)
+ if (test_ring_creation_with_an_used_name(flags) < 0)
goto test_fail;
- if (test_ring_with_exact_size() < 0)
+ if (test_ring_with_exact_size(flags) < 0)
goto test_fail;
/* dump the ring status */
@@ -873,4 +875,17 @@ test_ring(void)
return -1;
}
+static int
+test_ring(void)
+{
+ return __test_ring(0);
+}
+
+static int
+test_nb_ring(void)
+{
+ return __test_ring(RING_F_NB);
+}
+
REGISTER_TEST_COMMAND(ring_autotest, test_ring);
+REGISTER_TEST_COMMAND(ring_nb_autotest, test_nb_ring);
--
2.13.6
