X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_tailq.c;h=67da009d5e1b3640cbf484127c04a91127225434;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=b67eabdf74bb4a4313c5bf9a7701b567332557c7;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c index b67eabdf74..67da009d5e 100644 --- a/app/test/test_tailq.c +++ b/app/test/test_tailq.c @@ -1,36 +1,34 @@ /*- * 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 @@ -39,8 +37,8 @@ #include #include -#include - +#include +#include #include #include @@ -52,7 +50,7 @@ return 1; \ } while (0) -#define DEFAULT_TAILQ "dummy_q0" +#define DEFAULT_TAILQ (RTE_TAILQ_NUM) static struct rte_dummy d_elem; @@ -60,33 +58,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 +94,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 +104,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; }