From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 22105B153 for ; Fri, 13 Jun 2014 17:29:30 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 Jun 2014 08:29:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,471,1400050800"; d="scan'208";a="557055124" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 13 Jun 2014 08:29:35 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s5DFTYQf006731; Fri, 13 Jun 2014 16:29:34 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id s5DFTYqc020667; Fri, 13 Jun 2014 16:29:34 +0100 Received: (from aburakov@localhost) by sivswdev02.ir.intel.com with id s5DFTY6V020663; Fri, 13 Jun 2014 16:29:34 +0100 From: Anatoly Burakov To: dev@dpdk.org Date: Fri, 13 Jun 2014 16:29:29 +0100 Message-Id: X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 3/7] rte_hash: make rte_hash tailq fully local X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2014 15:29:31 -0000 --- lib/librte_hash/rte_hash.c | 54 ++++++++++++++++++++++++++++++++++++++-------- lib/librte_hash/rte_hash.h | 2 -- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c index d4221a8..a89ea44 100644 --- a/lib/librte_hash/rte_hash.c +++ b/lib/librte_hash/rte_hash.c @@ -60,7 +60,7 @@ #include "rte_hash.h" -TAILQ_HEAD(rte_hash_list, rte_hash); +TAILQ_HEAD(rte_hash_list, rte_tailq_entry); /* Macro to enable/disable run-time checking of function parameters */ #if defined(RTE_LIBRTE_HASH_DEBUG) @@ -141,24 +141,29 @@ find_first(uint32_t sig, const uint32_t *sig_bucket, uint32_t num_sigs) struct rte_hash * rte_hash_find_existing(const char *name) { - struct rte_hash *h; + struct rte_hash *h = NULL; + struct rte_tailq_entry *te; struct rte_hash_list *hash_list; /* check that we have an initialised tail queue */ - if ((hash_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) { + if ((hash_list = + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) { rte_errno = E_RTE_NO_TAILQ; return NULL; } rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK); - TAILQ_FOREACH(h, hash_list, next) { + TAILQ_FOREACH(te, hash_list, next) { + h = (struct rte_hash *) te->data; if (strncmp(name, h->name, RTE_HASH_NAMESIZE) == 0) break; } rte_rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK); - if (h == NULL) + if (te == NULL) { rte_errno = ENOENT; + return NULL; + } return h; } @@ -166,6 +171,7 @@ struct rte_hash * rte_hash_create(const struct rte_hash_parameters *params) { struct rte_hash *h = NULL; + struct rte_tailq_entry *te; uint32_t num_buckets, sig_bucket_size, key_size, hash_tbl_size, sig_tbl_size, key_tbl_size, mem_size; char hash_name[RTE_HASH_NAMESIZE]; @@ -212,17 +218,25 @@ rte_hash_create(const struct rte_hash_parameters *params) rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); /* guarantee there's no existing */ - TAILQ_FOREACH(h, hash_list, next) { + TAILQ_FOREACH(te, hash_list, next) { + h = (struct rte_hash *) te->data; if (strncmp(params->name, h->name, RTE_HASH_NAMESIZE) == 0) break; } - if (h != NULL) + if (te != NULL) + goto exit; + + te = rte_zmalloc("HASH_TAILQ_ENTRY", sizeof(*te), 0); + if (te == NULL) { + RTE_LOG(ERR, HASH, "tailq entry allocation failed\n"); goto exit; + } h = (struct rte_hash *)rte_zmalloc_socket(hash_name, mem_size, CACHE_LINE_SIZE, params->socket_id); if (h == NULL) { RTE_LOG(ERR, HASH, "memory allocation failed\n"); + rte_free(te); goto exit; } @@ -242,7 +256,9 @@ rte_hash_create(const struct rte_hash_parameters *params) h->hash_func = (params->hash_func == NULL) ? DEFAULT_HASH_FUNC : params->hash_func; - TAILQ_INSERT_TAIL(hash_list, h, next); + te->data = (void *) h; + + TAILQ_INSERT_TAIL(hash_list, te, next); exit: rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); @@ -253,11 +269,31 @@ exit: void rte_hash_free(struct rte_hash *h) { + struct rte_tailq_entry *te; + struct rte_hash_list *hash_list; + if (h == NULL) return; - RTE_EAL_TAILQ_REMOVE(RTE_TAILQ_HASH, rte_hash_list, h); + /* check that we have an initialised tail queue */ + if ((hash_list = + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) { + rte_errno = E_RTE_NO_TAILQ; + return; + } + + /* find out tailq entry */ + TAILQ_FOREACH(te, hash_list, next) { + if (te->data == (void *) h) + break; + } + + if (te == NULL) + return; + + RTE_EAL_TAILQ_REMOVE(RTE_TAILQ_HASH, rte_hash_list, te); rte_free(h); + rte_free(te); } static inline int32_t diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h index 5228e3a..2ecaf1a 100644 --- a/lib/librte_hash/rte_hash.h +++ b/lib/librte_hash/rte_hash.h @@ -86,8 +86,6 @@ struct rte_hash_parameters { /** A hash table structure. */ struct rte_hash { - TAILQ_ENTRY(rte_hash) next;/**< Next in list. */ - char name[RTE_HASH_NAMESIZE]; /**< Name of the hash. */ uint32_t entries; /**< Total table entries. */ uint32_t bucket_entries; /**< Bucket entries. */ -- 1.8.1.4