X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_tailq.c;h=9520219b0ad7c0b1a290256d94eb6c80570dfec8;hb=15e67d41c0564000f919aa86d78a6702399b79d3;hp=398f74bd53d5e796229d4ceea25fa582dbca8be5;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c index 398f74bd53..9520219b0a 100644 --- a/app/test/test_tailq.c +++ b/app/test/test_tailq.c @@ -1,47 +1,15 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 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. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include #include #include +#include #include #include -#include - #include -#include #include #include @@ -53,39 +21,59 @@ return 1; \ } while (0) -#define DEFAULT_TAILQ (RTE_TAILQ_NUM) +static struct rte_tailq_elem rte_dummy_tailq = { + .name = "dummy", +}; +EAL_REGISTER_TAILQ(rte_dummy_tailq) + +static struct rte_tailq_elem rte_dummy_dyn_tailq = { + .name = "dummy_dyn", +}; +static struct rte_tailq_elem rte_dummy_dyn2_tailq = { + .name = "dummy_dyn", +}; -static struct rte_dummy d_elem; +static struct rte_tailq_entry d_elem; +static struct rte_tailq_entry d_dyn_elem; static int -test_tailq_create(void) +test_tailq_early(void) { - struct rte_dummy_head *d_head; - unsigned i; + struct rte_tailq_entry_head *d_head; - /* create a first tailq and check its non-null */ - d_head = RTE_TAILQ_RESERVE_BY_IDX(DEFAULT_TAILQ, rte_dummy_head); + d_head = RTE_TAILQ_CAST(rte_dummy_tailq.head, rte_tailq_entry_head); if (d_head == NULL) - do_return("Error allocating dummy_q0\n"); + do_return("Error %s has not been initialised\n", + rte_dummy_tailq.name); - /* check we can add an item to it - */ + /* 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_BY_IDX(DEFAULT_TAILQ, rte_dummy_head) == NULL) - do_return("Error, non-null result returned when attemption to " - "re-allocate a tailq\n"); + return 0; +} + +static int +test_tailq_create(void) +{ + struct rte_tailq_entry_head *d_head; + + /* create a tailq and check its non-null (since we are post-eal init) */ + if ((rte_eal_tailq_register(&rte_dummy_dyn_tailq) < 0) || + (rte_dummy_dyn_tailq.head == NULL)) + do_return("Error allocating %s\n", rte_dummy_dyn_tailq.name); + + d_head = RTE_TAILQ_CAST(rte_dummy_dyn_tailq.head, rte_tailq_entry_head); + + /* check we can add an item to it */ + TAILQ_INSERT_TAIL(d_head, &d_dyn_elem, next); - /* 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) - break; - } + if (strcmp(rte_dummy_dyn2_tailq.name, rte_dummy_dyn_tailq.name)) + do_return("Error, something is wrong in the tailq test\n"); - /* 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 as expected\n"); + /* try allocating again, and check for failure */ + if (!rte_eal_tailq_register(&rte_dummy_dyn2_tailq)) + do_return("Error, registering the same tailq %s did not fail\n", + rte_dummy_dyn2_tailq.name); return 0; } @@ -94,11 +82,13 @@ static int test_tailq_lookup(void) { /* run successful test - check result is found */ - struct rte_dummy_head *d_head; - struct rte_dummy *d_ptr; + struct rte_tailq_entry_head *d_head; + struct rte_tailq_entry *d_ptr; - d_head = RTE_TAILQ_LOOKUP_BY_IDX(DEFAULT_TAILQ, rte_dummy_head); - if (d_head == NULL) + d_head = RTE_TAILQ_LOOKUP(rte_dummy_tailq.name, rte_tailq_entry_head); + /* rte_dummy_tailq has been registered by EAL_REGISTER_TAILQ */ + if (d_head == NULL || + d_head != RTE_TAILQ_CAST(rte_dummy_tailq.head, rte_tailq_entry_head)) do_return("Error with tailq lookup\n"); TAILQ_FOREACH(d_ptr, d_head, next) @@ -106,61 +96,33 @@ test_tailq_lookup(void) do_return("Error with tailq returned from lookup - " "expected element not found\n"); + d_head = RTE_TAILQ_LOOKUP(rte_dummy_dyn_tailq.name, rte_tailq_entry_head); + /* rte_dummy_dyn_tailq has been registered by test_tailq_create */ + if (d_head == NULL || + d_head != RTE_TAILQ_CAST(rte_dummy_dyn_tailq.head, rte_tailq_entry_head)) + do_return("Error with tailq lookup\n"); + + TAILQ_FOREACH(d_ptr, d_head, next) + if (d_ptr != &d_dyn_elem) + do_return("Error with tailq returned from lookup - " + "expected element not found\n"); + /* now try a bad/error lookup */ - d_head = RTE_TAILQ_LOOKUP_BY_IDX(RTE_MAX_TAILQ, rte_dummy_head); + d_head = RTE_TAILQ_LOOKUP("coucou", rte_tailq_entry_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_early(); ret |= test_tailq_create(); ret |= test_tailq_lookup(); - ret |= test_tailq_deprecated(); return ret; } + +REGISTER_TEST_COMMAND(tailq_autotest, test_tailq);