git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mbuf: remove rte_ctrlmbuf
[dpdk.git]
/
app
/
test
/
test_tailq.c
diff --git
a/app/test/test_tailq.c
b/app/test/test_tailq.c
index
ee380fd
..
4d32c6f
100644
(file)
--- a/
app/test/test_tailq.c
+++ b/
app/test/test_tailq.c
@@
-1,13
+1,13
@@
/*-
* BSD LICENSE
/*-
* BSD LICENSE
- *
+ *
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
* Copyright(c) 2010-2014 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:
* 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
* * 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
@@
-17,7
+17,7
@@
* * 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.
* * 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
* 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
@@
-37,8
+37,6
@@
#include <errno.h>
#include <sys/queue.h>
#include <errno.h>
#include <sys/queue.h>
-#include <cmdline_parse.h>
-
#include <rte_eal.h>
#include <rte_eal_memconfig.h>
#include <rte_string_fns.h>
#include <rte_eal.h>
#include <rte_eal_memconfig.h>
#include <rte_string_fns.h>
@@
-54,16
+52,16
@@
#define DEFAULT_TAILQ (RTE_TAILQ_NUM)
#define DEFAULT_TAILQ (RTE_TAILQ_NUM)
-static struct rte_
dumm
y d_elem;
+static struct rte_
tailq_entr
y d_elem;
static int
test_tailq_create(void)
{
static int
test_tailq_create(void)
{
- struct rte_
dumm
y_head *d_head;
+ struct rte_
tailq_entr
y_head *d_head;
unsigned i;
/* create a first tailq and check its non-null */
unsigned i;
/* create a first tailq and check its non-null */
- d_head = RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_
dumm
y_head);
+ d_head = RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_
tailq_entr
y_head);
if (d_head == NULL)
do_return("Error allocating dummy_q0\n");
if (d_head == NULL)
do_return("Error allocating dummy_q0\n");
@@
-72,13
+70,14
@@
test_tailq_create(void)
TAILQ_INSERT_TAIL(d_head, &d_elem, next);
/* try allocating dummy_q0 again, and check for failure */
TAILQ_INSERT_TAIL(d_head, &d_elem, next);
/* try allocating dummy_q0 again, and check for failure */
- if (RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_
dumm
y_head) == NULL)
+ if (RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_
tailq_entr
y_head) == NULL)
do_return("Error, non-null result returned when attemption to "
"re-allocate a tailq\n");
/* now fill up the tailq slots available and check we get an error */
for (i = RTE_TAILQ_NUM; i < RTE_MAX_TAILQ; i++){
do_return("Error, non-null result returned when attemption to "
"re-allocate a tailq\n");
/* now fill up the tailq slots available and check we get an error */
for (i = RTE_TAILQ_NUM; i < RTE_MAX_TAILQ; i++){
- if ((d_head = RTE_TAILQ_RESERVE_BY_IDX(i, rte_dummy_head)) == NULL)
+ if ((d_head = RTE_TAILQ_RESERVE_BY_IDX(i,
+ rte_tailq_entry_head)) == NULL)
break;
}
break;
}
@@
-93,10
+92,10
@@
static int
test_tailq_lookup(void)
{
/* run successful test - check result is found */
test_tailq_lookup(void)
{
/* run successful test - check result is found */
- struct rte_
dumm
y_head *d_head;
- struct rte_
dumm
y *d_ptr;
+ struct rte_
tailq_entr
y_head *d_head;
+ struct rte_
tailq_entr
y *d_ptr;
- d_head = RTE_TAILQ_LOOKUP_BY_IDX(DEFAULT_TAILQ, rte_
dumm
y_head);
+ d_head = RTE_TAILQ_LOOKUP_BY_IDX(DEFAULT_TAILQ, rte_
tailq_entr
y_head);
if (d_head == NULL)
do_return("Error with tailq lookup\n");
if (d_head == NULL)
do_return("Error with tailq lookup\n");
@@
-106,7
+105,7
@@
test_tailq_lookup(void)
"expected element not found\n");
/* now try a bad/error lookup */
"expected element not found\n");
/* now try a bad/error lookup */
- d_head = RTE_TAILQ_LOOKUP_BY_IDX(RTE_MAX_TAILQ, rte_
dumm
y_head);
+ d_head = RTE_TAILQ_LOOKUP_BY_IDX(RTE_MAX_TAILQ, rte_
tailq_entr
y_head);
if (d_head != NULL)
do_return("Error, lookup does not return NULL for bad tailq name\n");
if (d_head != NULL)
do_return("Error, lookup does not return NULL for bad tailq name\n");
@@
-117,7
+116,7
@@
test_tailq_lookup(void)
static int
test_tailq_deprecated(void)
{
static int
test_tailq_deprecated(void)
{
- struct rte_
dumm
y_head *d_head;
+ struct rte_
tailq_entr
y_head *d_head;
/* since TAILQ_RESERVE is not able to create new tailqs,
* we should find an existing one (IOW, RTE_TAILQ_RESERVE behaves identical
/* since TAILQ_RESERVE is not able to create new tailqs,
* we should find an existing one (IOW, RTE_TAILQ_RESERVE behaves identical
@@
-125,36
+124,36
@@
test_tailq_deprecated(void)
*
* PCI_RESOURCE_LIST tailq is guaranteed to
* be present in any DPDK app. */
*
* PCI_RESOURCE_LIST tailq is guaranteed to
* be present in any DPDK app. */
- d_head = RTE_TAILQ_RESERVE("PCI_RESOURCE_LIST", rte_
dumm
y_head);
+ d_head = RTE_TAILQ_RESERVE("PCI_RESOURCE_LIST", rte_
tailq_entr
y_head);
if (d_head == NULL)
do_return("Error finding PCI_RESOURCE_LIST\n");
if (d_head == NULL)
do_return("Error finding PCI_RESOURCE_LIST\n");
- d_head = RTE_TAILQ_LOOKUP("PCI_RESOURCE_LIST", rte_
dumm
y_head);
+ d_head = RTE_TAILQ_LOOKUP("PCI_RESOURCE_LIST", rte_
tailq_entr
y_head);
if (d_head == NULL)
do_return("Error finding PCI_RESOURCE_LIST\n");
/* try doing that with non-existent names */
if (d_head == NULL)
do_return("Error finding PCI_RESOURCE_LIST\n");
/* try doing that with non-existent names */
- d_head = RTE_TAILQ_RESERVE("random name", rte_
dumm
y_head);
+ d_head = RTE_TAILQ_RESERVE("random name", rte_
tailq_entr
y_head);
if (d_head != NULL)
do_return("Non-existent tailq found!\n");
if (d_head != NULL)
do_return("Non-existent tailq found!\n");
- d_head = RTE_TAILQ_LOOKUP("random name", rte_
dumm
y_head);
+ d_head = RTE_TAILQ_LOOKUP("random name", rte_
tailq_entr
y_head);
if (d_head != NULL)
do_return("Non-existent tailq found!\n");
/* try doing the same with NULL names */
if (d_head != NULL)
do_return("Non-existent tailq found!\n");
/* try doing the same with NULL names */
- d_head = RTE_TAILQ_RESERVE(NULL, rte_
dumm
y_head);
+ d_head = RTE_TAILQ_RESERVE(NULL, rte_
tailq_entr
y_head);
if (d_head != NULL)
do_return("NULL tailq found!\n");
if (d_head != NULL)
do_return("NULL tailq found!\n");
- d_head = RTE_TAILQ_LOOKUP(NULL, rte_
dumm
y_head);
+ d_head = RTE_TAILQ_LOOKUP(NULL, rte_
tailq_entr
y_head);
if (d_head != NULL)
do_return("NULL tailq found!\n");
return 0;
}
if (d_head != NULL)
do_return("NULL tailq found!\n");
return 0;
}
-int
+
static
int
test_tailq(void)
{
int ret = 0;
test_tailq(void)
{
int ret = 0;
@@
-163,3
+162,9
@@
test_tailq(void)
ret |= test_tailq_deprecated();
return ret;
}
ret |= test_tailq_deprecated();
return ret;
}
+
+static struct test_command tailq_cmd = {
+ .command = "tailq_autotest",
+ .callback = test_tailq,
+};
+REGISTER_TEST_COMMAND(tailq_cmd);