From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 9F0495683 for ; Thu, 3 Dec 2015 10:25:53 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 03 Dec 2015 01:25:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,377,1444719600"; d="scan'208";a="852966585" Received: from irsmsx152.ger.corp.intel.com ([163.33.192.66]) by fmsmga001.fm.intel.com with ESMTP; 03 Dec 2015 01:25:51 -0800 Received: from irsmsx156.ger.corp.intel.com (10.108.20.68) by IRSMSX152.ger.corp.intel.com (163.33.192.66) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 3 Dec 2015 09:25:50 +0000 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.23]) by IRSMSX156.ger.corp.intel.com ([169.254.3.110]) with mapi id 14.03.0248.002; Thu, 3 Dec 2015 09:25:50 +0000 From: "De Lara Guarch, Pablo" To: Yu Nemo Wenbin , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to ver DPDK_2.2. Thread-Index: AQHRLYrSPsUPLfDEVUeFC53Dl4nVDZ64/IWQ Date: Thu, 3 Dec 2015 09:25:49 +0000 Message-ID: References: <1447895712-12159-1-git-send-email-yuwb_bjy@ctbri.com.cn> <1449120209-9990-1-git-send-email-yuwb_bjy@ctbri.com.cn> In-Reply-To: <1449120209-9990-1-git-send-email-yuwb_bjy@ctbri.com.cn> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to ver 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: Thu, 03 Dec 2015 09:25:54 -0000 Hi Nemo, > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Yu Nemo Wenbin > Sent: Thursday, December 03, 2015 5:23 AM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to > ver DPDK_2.2. >=20 > Also modified the comments of rte_hash_set_cmp_func(). >=20 > Signed-off-by: Yu Nemo Wenbin > --- > lib/librte_hash/rte_hash.h | 4 ++-- > lib/librte_hash/rte_hash_version.map | 8 +++++++- > 2 files changed, 9 insertions(+), 3 deletions(-) >=20 > diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h > index 8378a42..dfca5ef 100644 > --- a/lib/librte_hash/rte_hash.h > +++ b/lib/librte_hash/rte_hash.h > @@ -66,7 +66,7 @@ typedef uint32_t hash_sig_t; > typedef uint32_t (*rte_hash_function)(const void *key, uint32_t key_len, > uint32_t init_val); >=20 > -/** Type of function used to compare the key. It works like the memcmp() > */ > +/** 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); >=20 > /** > @@ -108,7 +108,7 @@ rte_hash_create(const struct rte_hash_parameters > *params); >=20 > /** > * Set the rte_hash_set_cmp_func. > - * Set the new hash compare function if the default one is not suitable > enough. > + * 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. > diff --git a/lib/librte_hash/rte_hash_version.map > b/lib/librte_hash/rte_hash_version.map > index 3bc1e2c..1aa94f9 100644 > --- a/lib/librte_hash/rte_hash_version.map > +++ b/lib/librte_hash/rte_hash_version.map > @@ -30,6 +30,12 @@ DPDK_2.1 { > rte_hash_lookup_data; > rte_hash_lookup_with_hash_data; > rte_hash_reset; > - rte_hash_set_cmp_func; >=20 > } DPDK_2.0; > + > +DPDK_2.2 { > + global: > + > + rte_hash_set_cmp_func; > + > +} DPDK_2.1; > -- > 1.9.1 I see you are basing off the v1 of this patch. You need to send all the cha= nges in one go. So, include the missing code in rte_cuckoo_hash.c, and include rte_hash_set= _cmp_func in rte_hash_version.map, but don't remove it from DPDK_2.1, as it does not = exist now. In other words, create a patch from the current head of mainline, send it a= s a v3, include the changes you made from v1->v2 and v2->v3 and send it again (and = don't forget to use --in-reply-to). Plus, remove the "to ver DPDK_2.2" part from the tile of the patch. Thanks! Pablo