From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.ctbri.com.cn (unknown [219.142.69.33]) by dpdk.org (Postfix) with ESMTP id C057558DB for ; Wed, 2 Dec 2015 03:19:33 +0100 (CET) Received: from localhost.localdomain ([10.9.63.134]) by mail.ctbri.com.cn (Lotus Domino Release 8.5.3FP1) with ESMTP id 2015120210193113-156462 ; Wed, 2 Dec 2015 10:19:31 +0800 From: Yu Nemo Wenbin To: dev@dpdk.org Date: Wed, 2 Dec 2015 10:19:07 +0800 Message-Id: <1449022747-1056-1-git-send-email-yuwb_bjy@ctbri.com.cn> X-Mailer: git-send-email 1.9.1 X-MIMETrack: Itemize by SMTP Server on mailserver/ctbri(Release 8.5.3FP1|March 07, 2012) at 2015/12/02 10:19:31, Serialize by Router on mailserver/ctbri(Release 8.5.3FP1|March 07, 2012) at 2015/12/02 10:19:34, Serialize complete at 2015/12/02 10:19:34 X-TNEFEvaluated: 1 Subject: [dpdk-dev] [PATCH] hash: add rte_hash_set_cmp_func() function to DPDK_2.2. 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: Wed, 02 Dec 2015 02:19:34 -0000 Give user a chance to customize the hash key compare function. The default rte_hash_cmp_eq function is set in the rte_hash_create function, but these builtin ones may not be good enough, so the user may call this to override the default one. Signed-off-by: Yu Nemo Wenbin --- lib/librte_hash/rte_cuckoo_hash.c | 7 +++++-- lib/librte_hash/rte_hash.h | 15 +++++++++++++++ lib/librte_hash/rte_hash_version.map | 7 +++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index 88f77c3..2ccb81c 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -102,8 +102,6 @@ EAL_REGISTER_TAILQ(rte_hash_tailq) #define LCORE_CACHE_SIZE 8 -typedef int (*rte_hash_cmp_eq_t)(const void *key1, const void *key2, size_t key_len); - struct lcore_cache { unsigned len; /**< Cache len */ void *objs[LCORE_CACHE_SIZE]; /**< Cache objects */ @@ -187,6 +185,11 @@ rte_hash_find_existing(const char *name) return h; } +void rte_hash_set_cmp_func(struct rte_hash *h, rte_hash_cmp_eq_t func) +{ + h->rte_hash_cmp_eq = func; +} + struct rte_hash * rte_hash_create(const struct rte_hash_parameters *params) { diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h index b678766..dfca5ef 100644 --- a/lib/librte_hash/rte_hash.h +++ b/lib/librte_hash/rte_hash.h @@ -66,6 +66,9 @@ typedef uint32_t hash_sig_t; typedef uint32_t (*rte_hash_function)(const void *key, uint32_t key_len, uint32_t init_val); +/** Type of function used to compare the hash key. */ +typedef int (*rte_hash_cmp_eq_t)(const void *key1, const void *key2, size_t key_len); + /** * Parameters used when creating the hash table. */ @@ -104,6 +107,18 @@ struct rte_hash * rte_hash_create(const struct rte_hash_parameters *params); /** + * Set the rte_hash_set_cmp_func. + * Set a new hash compare function other than the default one. + * + * @note Function pointer does not work with multi-process, so don't use it + * in multi-process mode. + * + * @param h + * Hash table to reset + */ +void rte_hash_set_cmp_func(struct rte_hash *h, rte_hash_cmp_eq_t func); + +/** * Find an existing hash table object and return a pointer to it. * * @param name diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map index 906c8ad..1aa94f9 100644 --- a/lib/librte_hash/rte_hash_version.map +++ b/lib/librte_hash/rte_hash_version.map @@ -32,3 +32,10 @@ DPDK_2.1 { rte_hash_reset; } DPDK_2.0; + +DPDK_2.2 { + global: + + rte_hash_set_cmp_func; + +} DPDK_2.1; -- 1.9.1