From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com
Subject: [dpdk-dev] [PATCH 2/4] hash: allocation of an existing object should fail
Date: Wed, 30 Mar 2016 17:30:25 +0200 [thread overview]
Message-ID: <1459351827-3346-3-git-send-email-olivier.matz@6wind.com> (raw)
In-Reply-To: <1459351827-3346-1-git-send-email-olivier.matz@6wind.com>
Change the API of rte_hash*_create() functions to return NULL and set
rte_errno to EEXIST when the object name already exists.
These functions were returning a pointer to the existing object in that
case, but it is a problem as the caller did not know if the object had
to be freed or not.
Doing this change also makes the hash API more consistent with the other
APIs (mempool, rings, ...).
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
lib/librte_hash/rte_cuckoo_hash.c | 6 ++++--
lib/librte_hash/rte_fbk_hash.c | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 71b5b76..ccec2db 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -230,8 +230,10 @@ rte_hash_create(const struct rte_hash_parameters *params)
/* Guarantee there's no existing */
h = rte_hash_find_existing(params->name);
- if (h != NULL)
- return h;
+ if (h != NULL) {
+ rte_errno = EEXIST;
+ return NULL;
+ }
te = rte_zmalloc("HASH_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/librte_hash/rte_fbk_hash.c
index 8752a47..ba1e475 100644
--- a/lib/librte_hash/rte_fbk_hash.c
+++ b/lib/librte_hash/rte_fbk_hash.c
@@ -140,8 +140,11 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
if (strncmp(params->name, ht->name, RTE_FBK_HASH_NAMESIZE) == 0)
break;
}
- if (te != NULL)
+ if (te != NULL) {
+ ht = NULL;
+ rte_errno = EEXIST;
goto exit;
+ }
te = rte_zmalloc("FBK_HASH_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
--
2.1.4
next prev parent reply other threads:[~2016-03-30 15:31 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 12:25 [dpdk-dev] [RFC] hash/lpm: return NULL if the object exists Olivier Matz
2016-03-25 10:32 ` Olivier Matz
2016-03-25 10:45 ` Bruce Richardson
2016-03-30 15:30 ` [dpdk-dev] [PATCH 0/4] fix lpm and hash creation Olivier Matz
2016-03-30 15:30 ` [dpdk-dev] [PATCH 1/4] lpm: allocation of an existing object should fail Olivier Matz
2016-03-30 21:46 ` Stephen Hemminger
2016-03-31 7:35 ` Olivier Matz
2016-04-01 16:25 ` Olivier Matz
2016-03-31 10:55 ` Bruce Richardson
2016-03-30 15:30 ` Olivier Matz [this message]
2016-03-30 15:30 ` [dpdk-dev] [PATCH 3/4] hash: keep the list locked at creation Olivier Matz
2016-03-30 15:30 ` [dpdk-dev] [PATCH 4/4] autotest: fix func reentrancy Olivier Matz
2016-03-31 7:35 ` [dpdk-dev] [PATCH 0/4] fix lpm and hash creation Olivier Matz
2016-04-05 7:35 ` [dpdk-dev] [PATCH v2 0/4] fix creation of duplicate lpm and hash Olivier Matz
2016-04-05 7:35 ` [dpdk-dev] [PATCH v2 1/4] lpm: allocation of an existing object should fail Olivier Matz
2016-04-05 7:35 ` [dpdk-dev] [PATCH v2 2/4] hash: " Olivier Matz
2016-04-05 7:35 ` [dpdk-dev] [PATCH v2 3/4] hash: keep the list locked at creation Olivier Matz
2016-04-05 11:05 ` De Lara Guarch, Pablo
2016-04-05 7:35 ` [dpdk-dev] [PATCH v2 4/4] autotest: fix func reentrancy Olivier Matz
2016-04-05 11:00 ` De Lara Guarch, Pablo
2016-04-05 11:53 ` [dpdk-dev] [PATCH v3 0/4] fix creation of duplicate lpm and hash Olivier Matz
2016-04-05 11:53 ` [dpdk-dev] [PATCH v3 1/4] lpm: allocation of an existing object should fail Olivier Matz
2016-04-05 11:53 ` [dpdk-dev] [PATCH v3 2/4] hash: " Olivier Matz
2016-04-05 11:53 ` [dpdk-dev] [PATCH v3 3/4] hash: keep the list locked at creation Olivier Matz
2016-04-05 11:53 ` [dpdk-dev] [PATCH v3 4/4] autotest: fix func reentrancy Olivier Matz
2016-04-05 15:51 ` [dpdk-dev] [PATCH v3 0/4] fix creation of duplicate lpm and hash Thomas Monjalon
2016-04-06 10:11 ` De Lara Guarch, Pablo
2016-04-06 10:32 ` De Lara Guarch, Pablo
2016-04-06 11:14 ` Olivier Matz
2016-04-06 11:20 ` De Lara Guarch, Pablo
2016-04-06 11:57 ` Olivier Matz
2016-04-06 13:27 ` [dpdk-dev] [PATCH v4 " Olivier Matz
2016-04-06 13:27 ` [dpdk-dev] [PATCH v4 1/4] lpm: allocation of an existing object should fail Olivier Matz
2016-04-06 13:27 ` [dpdk-dev] [PATCH v4 2/4] hash: " Olivier Matz
2016-04-06 13:28 ` [dpdk-dev] [PATCH v4 3/4] hash: keep the list locked at creation Olivier Matz
2016-04-06 13:28 ` [dpdk-dev] [PATCH v4 4/4] autotest: fix func reentrancy Olivier Matz
2016-04-06 15:31 ` [dpdk-dev] [PATCH v4 0/4] fix creation of duplicate lpm and hash Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459351827-3346-3-git-send-email-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).