update copyright date to 2013

[dpdk.git] / app / test / test_tailq.c

diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c
index b67eabd..398f74b 100644 (file)
--- a/app/test/test_tailq.c
+++ b/app/test/test_tailq.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 
@@ -30,7 +30,6 @@
  *   (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
  */
 
 #include <stdio.h>
@@ -41,6 +40,8 @@
 
 #include <cmdline_parse.h>
 
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
 #include <rte_string_fns.h>
 #include <rte_tailq.h>
 
@@ -52,7 +53,7 @@
        return 1; \
 } while (0)
 
-#define DEFAULT_TAILQ "dummy_q0"
+#define DEFAULT_TAILQ (RTE_TAILQ_NUM)
 
 static struct rte_dummy d_elem;
 
@@ -60,33 +61,31 @@ static int
 test_tailq_create(void)
 {
        struct rte_dummy_head *d_head;
-       char name[RTE_TAILQ_NAMESIZE];
        unsigned i;
 
        /* create a first tailq and check its non-null */
-       d_head = RTE_TAILQ_RESERVE(DEFAULT_TAILQ, rte_dummy_head);
+       d_head = RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_dummy_head);
        if (d_head == NULL)
-               do_return("Error allocating "DEFAULT_TAILQ"\n");
+               do_return("Error allocating dummy_q0\n");
 
        /* check we can add an item to it
         */
        TAILQ_INSERT_TAIL(d_head, &d_elem, next);
 
        /* try allocating dummy_q0 again, and check for failure */
-       if (RTE_TAILQ_RESERVE(DEFAULT_TAILQ, rte_dummy_head) != NULL)
+       if (RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_dummy_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 = 1; i < RTE_MAX_TAILQ; i++){
-               rte_snprintf(name, sizeof(name), "dummy_q%u", i);
-               if ((d_head = RTE_TAILQ_RESERVE(name, rte_dummy_head)) == NULL)
+       for (i = RTE_TAILQ_NUM; i < RTE_MAX_TAILQ; i++){
+               if ((d_head = RTE_TAILQ_RESERVE_BY_IDX(i, rte_dummy_head)) == NULL)
                        break;
        }
 
        /* check that we had an error return before RTE_MAX_TAILQ */
-       if (i == RTE_MAX_TAILQ)
-               do_return("Error, we did not have a reservation failure as expected\n");
+       if (i != RTE_MAX_TAILQ)
+               do_return("Error, we did not have a reservation as expected\n");
 
        return 0;
 }
@@ -98,7 +97,7 @@ test_tailq_lookup(void)
        struct rte_dummy_head *d_head;
        struct rte_dummy *d_ptr;
 
-       d_head = RTE_TAILQ_LOOKUP(DEFAULT_TAILQ, rte_dummy_head);
+       d_head = RTE_TAILQ_LOOKUP_BY_IDX(DEFAULT_TAILQ, rte_dummy_head);
        if (d_head == NULL)
                do_return("Error with tailq lookup\n");
 
@@ -108,18 +107,60 @@ test_tailq_lookup(void)
                                        "expected element not found\n");
 
        /* now try a bad/error lookup */
-       d_head = RTE_TAILQ_LOOKUP("does_not_exist_queue", rte_dummy_head);
+       d_head = RTE_TAILQ_LOOKUP_BY_IDX(RTE_MAX_TAILQ, rte_dummy_head);
        if (d_head != NULL)
                do_return("Error, lookup does not return NULL for bad tailq name\n");
 
        return 0;
 }
 
+/* test for deprecated functions - mainly for coverage */
+static int
+test_tailq_deprecated(void)
+{
+       struct rte_dummy_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
+        * to RTE_TAILQ_LOOKUP).
+        *
+        * PCI_RESOURCE_LIST tailq is guaranteed to
+        * be present in any DPDK app. */
+       d_head = RTE_TAILQ_RESERVE("PCI_RESOURCE_LIST", rte_dummy_head);
+       if (d_head == NULL)
+               do_return("Error finding PCI_RESOURCE_LIST\n");
+
+       d_head = RTE_TAILQ_LOOKUP("PCI_RESOURCE_LIST", rte_dummy_head);
+       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_dummy_head);
+       if (d_head != NULL)
+               do_return("Non-existent tailq found!\n");
+
+       d_head = RTE_TAILQ_LOOKUP("random name", rte_dummy_head);
+       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_dummy_head);
+       if (d_head != NULL)
+               do_return("NULL tailq found!\n");
+
+       d_head = RTE_TAILQ_LOOKUP(NULL, rte_dummy_head);
+       if (d_head != NULL)
+               do_return("NULL tailq found!\n");
+
+       return 0;
+}
+
 int
 test_tailq(void)
 {
        int ret = 0;
        ret |= test_tailq_create();
        ret |= test_tailq_lookup();
+       ret |= test_tailq_deprecated();
        return ret;
 }