X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_tailq.c;h=33a3e8a9c841b8d1835d652cfeceb0b6d889d223;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=b67eabdf74bb4a4313c5bf9a7701b567332557c7;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c index b67eabdf74..33a3e8a9c8 100644 --- a/app/test/test_tailq.c +++ b/app/test/test_tailq.c @@ -1,48 +1,46 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. 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 + * + * 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 + * + * * 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 + * * 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 + * * 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 + * + * 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 */ #include #include #include +#include #include #include -#include - +#include +#include #include -#include #include "test.h" @@ -52,41 +50,59 @@ return 1; \ } while (0) -#define DEFAULT_TAILQ "dummy_q0" +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; - char name[RTE_TAILQ_NAMESIZE]; - unsigned i; + struct rte_tailq_entry_head *d_head; - /* create a first tailq and check its non-null */ - d_head = RTE_TAILQ_RESERVE(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 "DEFAULT_TAILQ"\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(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); - /* 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) - break; - } + /* check we can add an item to it */ + TAILQ_INSERT_TAIL(d_head, &d_dyn_elem, next); - /* 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 (strcmp(rte_dummy_dyn2_tailq.name, rte_dummy_dyn_tailq.name)) + do_return("Error, something is wrong in the tailq test\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; } @@ -95,11 +111,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(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) @@ -107,19 +125,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("does_not_exist_queue", 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; } -int +static int test_tailq(void) { int ret = 0; + ret |= test_tailq_early(); ret |= test_tailq_create(); ret |= test_tailq_lookup(); return ret; } + +REGISTER_TEST_COMMAND(tailq_autotest, test_tailq);