X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_tailqs.c;h=ead06897b88bf06e81f28e5dc589788882bf3eea;hb=f58880682c81d412369742ff7e8159f226d9e620;hp=3c4e70d235e2da8f0f85249acc642285a04e4951;hpb=873a61c7526be06f45d8d709a7c56d10cc06ab34;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/librte_eal/common/eal_common_tailqs.c index 3c4e70d235..ead06897b8 100644 --- a/lib/librte_eal/common/eal_common_tailqs.c +++ b/lib/librte_eal/common/eal_common_tailqs.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * 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 - * 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 @@ -40,13 +11,11 @@ #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -54,14 +23,7 @@ #include #include "eal_private.h" - -/** - * Name of tailq_head - */ -const char* rte_tailq_names[RTE_MAX_TAILQ] = { -#define rte_tailq_elem(idx, name) name, -#include -}; +#include "eal_memcfg.h" TAILQ_HEAD(rte_tailq_elem_head, rte_tailq_elem); /* local tailq list */ @@ -81,11 +43,6 @@ rte_eal_tailq_lookup(const char *name) return NULL; for (i = 0; i < RTE_MAX_TAILQ; i++) { - if (i < RTE_TAILQ_NUM && - !strncmp(name, rte_tailq_names[i], RTE_TAILQ_NAMESIZE-1)) - return &mcfg->tailq_head[i]; - - /* if past static entries, look at shared mem for names */ if (!strncmp(name, mcfg->tailq_head[i].name, RTE_TAILQ_NAMESIZE-1)) return &mcfg->tailq_head[i]; @@ -94,19 +51,6 @@ rte_eal_tailq_lookup(const char *name) return NULL; } -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 (tailq_idx >= RTE_MAX_TAILQ) { - RTE_LOG(ERR, EAL, "%s(): No more room in config\n", __func__); - return NULL; - } - - return &mcfg->tailq_head[tailq_idx]; -} - void rte_dump_tailq(FILE *f) { @@ -115,21 +59,15 @@ rte_dump_tailq(FILE *f) mcfg = rte_eal_get_configuration()->mem_config; - rte_rwlock_read_lock(&mcfg->qlock); + rte_mcfg_tailq_read_lock(); for (i = 0; i < RTE_MAX_TAILQ; i++) { const struct rte_tailq_head *tailq = &mcfg->tailq_head[i]; const struct rte_tailq_entry_head *head = &tailq->tailq_head; - const char *name = "nil"; - - if (rte_tailq_names[i]) - name = rte_tailq_names[i]; - else if (tailq->name) - name = tailq->name; fprintf(f, "Tailq %u: qname:<%s>, tqh_first:%p, tqh_last:%p\n", - i, name, head->tqh_first, head->tqh_last); + i, tailq->name, head->tqh_first, head->tqh_last); } - rte_rwlock_read_unlock(&mcfg->qlock); + rte_mcfg_tailq_read_unlock(); } static struct rte_tailq_head * @@ -143,7 +81,7 @@ rte_eal_tailq_create(const char *name) mcfg = rte_eal_get_configuration()->mem_config; head = &mcfg->tailq_head[rte_tailqs_count]; - snprintf(head->name, sizeof(head->name) - 1, "%s", name); + strlcpy(head->name, name, sizeof(head->name) - 1); TAILQ_INIT(&head->tailq_head); rte_tailqs_count++; } @@ -182,7 +120,7 @@ int rte_eal_tailq_register(struct rte_tailq_elem *t) { if (rte_eal_tailq_local_register(t) < 0) { - rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + RTE_LOG(ERR, EAL, "%s tailq is already registered\n", t->name); goto error; } @@ -192,7 +130,7 @@ rte_eal_tailq_register(struct rte_tailq_elem *t) if (rte_tailqs_count >= 0) { rte_eal_tailq_update(t); if (t->head == NULL) { - rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + RTE_LOG(ERR, EAL, "Cannot initialize tailq: %s\n", t->name); TAILQ_REMOVE(&rte_tailq_elem_head, t, next); goto error; @@ -209,30 +147,18 @@ error: int rte_eal_tailqs_init(void) { - unsigned i; - struct rte_mem_config *mcfg = NULL; struct rte_tailq_elem *t; - 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_TAILQ_NUM; i++) - TAILQ_INIT(&mcfg->tailq_head[i].tailq_head); - } - - /* mark those static entries as already taken */ - rte_tailqs_count = RTE_TAILQ_NUM; + rte_tailqs_count = 0; TAILQ_FOREACH(t, &rte_tailq_elem_head, next) { /* second part of register job for "early" tailqs, see * rte_eal_tailq_register and EAL_REGISTER_TAILQ */ rte_eal_tailq_update(t); if (t->head == NULL) { - rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + RTE_LOG(ERR, EAL, "Cannot initialize tailq: %s\n", t->name); - /* no need to TAILQ_REMOVE, we are going to panic in - * rte_eal_init() */ + /* TAILQ_REMOVE not needed, error is already fatal */ goto fail; } }