X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_tailqs.c;h=a9f71bc2e38b037a3ddd46d903156ba92f6ed93c;hb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;hp=65c0e163f76ffa840fdf6b0ab4c710f6b4ec1e56;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/librte_eal/common/eal_common_tailqs.c index 65c0e163f7..a9f71bc2e3 100644 --- a/lib/librte_eal/common/eal_common_tailqs.c +++ b/lib/librte_eal/common/eal_common_tailqs.c @@ -1,35 +1,34 @@ /*- * 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 - * 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. - * */ #include @@ -38,12 +37,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -51,9 +52,16 @@ #include #include #include + #include "eal_private.h" -static unsigned tailq_idx = 0; +/** + * Name of tailq_head + */ +const char* rte_tailq_names[RTE_MAX_TAILQ] = { +#define rte_tailq_elem(idx, name) name, +#include +}; struct rte_tailq_head * rte_eal_tailq_lookup(const char *name) @@ -61,52 +69,78 @@ rte_eal_tailq_lookup(const char *name) unsigned i; struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; - /* - * the algorithm is not optimal (linear), but there are few - * tailq's and this function should be called at init only - */ + if (name == NULL) + return NULL; + for (i = 0; i < RTE_MAX_TAILQ; i++) { - if (!strncmp(name, mcfg->tailq_head[i].qname, RTE_TAILQ_NAMESIZE-1)) + if (rte_tailq_names[i] == NULL) + continue; + if (!strncmp(name, rte_tailq_names[i], RTE_TAILQ_NAMESIZE-1)) return &mcfg->tailq_head[i]; } + return NULL; } -struct rte_tailq_head * -rte_eal_tailq_reserve(const char *name) +inline struct rte_tailq_head * +rte_eal_tailq_lookup_by_idx(const unsigned tailq_idx) { struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; - if (rte_eal_process_type() == RTE_PROC_SECONDARY) - return rte_eal_tailq_lookup(name); - - if (tailq_idx == RTE_MAX_TAILQ){ + if (tailq_idx >= RTE_MAX_TAILQ) { RTE_LOG(ERR, EAL, "%s(): No more room in config\n", __func__); return NULL; } - /* zone already exist */ - if (rte_eal_tailq_lookup(name) != NULL) { - RTE_LOG(DEBUG, EAL, "%s(): tailq <%s> already exists\n", - __func__, name); - return NULL; - } + return &mcfg->tailq_head[tailq_idx]; +} - rte_snprintf(mcfg->tailq_head[tailq_idx].qname, RTE_TAILQ_NAMESIZE, - "%.*s", (int)(RTE_TAILQ_NAMESIZE - 1), name); +struct rte_tailq_head * +rte_eal_tailq_reserve(const char *name) +{ + return rte_eal_tailq_lookup(name); +} - return &mcfg->tailq_head[tailq_idx++]; +inline struct rte_tailq_head * +rte_eal_tailq_reserve_by_idx(const unsigned tailq_idx) +{ + return rte_eal_tailq_lookup_by_idx(tailq_idx); +} + +void +rte_dump_tailq(void) +{ + struct rte_mem_config *mcfg; + unsigned i = 0; + + mcfg = rte_eal_get_configuration()->mem_config; + + rte_rwlock_read_lock(&mcfg->qlock); + for (i=0; i < RTE_MAX_TAILQ; i++) { + const struct rte_tailq_head *tailq = &mcfg->tailq_head[i]; + const struct rte_dummy_head *head = &tailq->tailq_head; + + printf("Tailq %o: qname:<%s>, tqh_first:%p, tqh_last:%p\n", i, + (rte_tailq_names[i] != NULL ? rte_tailq_names[i]:"nil"), + head->tqh_first, head->tqh_last); + } + rte_rwlock_read_unlock(&mcfg->qlock); } int rte_eal_tailqs_init(void) { unsigned i; - struct rte_config *cfg = rte_eal_get_configuration(); + struct rte_mem_config *mcfg = NULL; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) + RTE_BUILD_BUG_ON(RTE_MAX_TAILQ < RTE_TAILQ_NUM); + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + mcfg = rte_eal_get_configuration()->mem_config; for (i = 0; i < RTE_MAX_TAILQ; i++) - TAILQ_INIT(&cfg->mem_config->tailq_head[i].tailq_head); + TAILQ_INIT(&mcfg->tailq_head[i].tailq_head); + } return 0; } +