[dpdk-dev] [PATCH] hash: add rte_hash_set_cmp_func() function.

[dpdk-dev] [PATCH] hash: add rte_hash_set_cmp_func() function.

[Yu Nemo Wenbin]

Give user a chance to costomize 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 good enough, so the user
may call this to override the default one.

Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
---
 lib/librte_hash/rte_cuckoo_hash.c    |  7 +++++--
 lib/librte_hash/rte_hash.h           | 15 +++++++++++++++
 lib/librte_hash/rte_hash_version.map |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 1e970de..71e2419 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -98,8 +98,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 */
@@ -183,6 +181,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..8378a42 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 key. It works like the memcmp() */
+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 the new hash compare function if the default one is not suitable enough.
+ *
+ * @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..3bc1e2c 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -30,5 +30,6 @@ DPDK_2.1 {
 	rte_hash_lookup_data;
 	rte_hash_lookup_with_hash_data;
 	rte_hash_reset;
+	rte_hash_set_cmp_func;
 
 } DPDK_2.0;
-- 
1.9.1

Re: [dpdk-dev] [PATCH] hash: add rte_hash_set_cmp_func() function.

[De Lara Guarch, Pablo]

Hi,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Yu Nemo Wenbin
> Sent: Thursday, November 19, 2015 1:15 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] hash: add rte_hash_set_cmp_func() function.
> 
> Give user a chance to costomize 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 good enough, so the user
> may call this to override the default one.

Typos in "costomize" and "may not good" (may not be good)
> 
> Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
> ---
>  lib/librte_hash/rte_cuckoo_hash.c    |  7 +++++--
>  lib/librte_hash/rte_hash.h           | 15 +++++++++++++++
>  lib/librte_hash/rte_hash_version.map |  1 +
>  3 files changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_hash/rte_cuckoo_hash.c
> b/lib/librte_hash/rte_cuckoo_hash.c
> index 1e970de..71e2419 100644
> --- a/lib/librte_hash/rte_cuckoo_hash.c
> +++ b/lib/librte_hash/rte_cuckoo_hash.c
> @@ -98,8 +98,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 */
> @@ -183,6 +181,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..8378a42 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 key. It works like the memcmp()
> */

Remove "the".

> +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 the new hash compare function if the default one is not suitable
> enough.
> + *
> + * @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..3bc1e2c 100644
> --- a/lib/librte_hash/rte_hash_version.map
> +++ b/lib/librte_hash/rte_hash_version.map
> @@ -30,5 +30,6 @@ DPDK_2.1 {
>  	rte_hash_lookup_data;
>  	rte_hash_lookup_with_hash_data;
>  	rte_hash_reset;
> +	rte_hash_set_cmp_func;
> 
>  } DPDK_2.0;
> --
> 1.9.1

You have to add the new function in a different set (create a new one for 2.2).

Thanks,
Pablo

[dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to ver DPDK_2.2.

[Yu Nemo Wenbin]

Also modified the comments of rte_hash_set_cmp_func().

Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
---
 lib/librte_hash/rte_hash.h           | 4 ++--
 lib/librte_hash/rte_hash_version.map | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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);
 
-/** 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);
 
 /**
@@ -108,7 +108,7 @@ rte_hash_create(const struct rte_hash_parameters *params);
 
 /**
  * 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;
 
 } DPDK_2.0;
+
+DPDK_2.2 {
+	global:
+
+	rte_hash_set_cmp_func;
+
+} DPDK_2.1;
-- 
1.9.1

Re: [dpdk-dev] [PATCH v2] hash: move rte_hash_set_cmp_func() to ver DPDK_2.2.

[De Lara Guarch, Pablo]

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.
> 
> Also modified the comments of rte_hash_set_cmp_func().
> 
> Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
> ---
>  lib/librte_hash/rte_hash.h           | 4 ++--
>  lib/librte_hash/rte_hash_version.map | 8 +++++++-
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> 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);
> 
> -/** 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);
> 
>  /**
> @@ -108,7 +108,7 @@ rte_hash_create(const struct rte_hash_parameters
> *params);
> 
>  /**
>   * 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;
> 
>  } 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 changes 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 as 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

[dpdk-dev] [PATCH v3 1/3] hash: add rte_hash_set_cmp_func() function.

[Yu Nemo Wenbin]

Give user a chance to costomize 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 good enough, so the user
may call this to override the default one.

Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
---
 lib/librte_hash/rte_cuckoo_hash.c    |  7 +++++--
 lib/librte_hash/rte_hash.h           | 15 +++++++++++++++
 lib/librte_hash/rte_hash_version.map |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 1e970de..71e2419 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -98,8 +98,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 */
@@ -183,6 +181,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..8378a42 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 key. It works like the memcmp() */
+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 the new hash compare function if the default one is not suitable enough.
+ *
+ * @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..3bc1e2c 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -30,5 +30,6 @@ DPDK_2.1 {
 	rte_hash_lookup_data;
 	rte_hash_lookup_with_hash_data;
 	rte_hash_reset;
+	rte_hash_set_cmp_func;
 
 } DPDK_2.0;
-- 
1.9.1

[dpdk-dev] [PATCH v3 2/3] hash: add rte_hash_set_cmp_func() function.

[Yu Nemo Wenbin]

Add this function to DPDK_2.2 and modified the comments of rte_hash_set_cmp_func().

Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
---
 lib/librte_hash/rte_hash.h           | 4 ++--
 lib/librte_hash/rte_hash_version.map | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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);
 
-/** 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);
 
 /**
@@ -108,7 +108,7 @@ rte_hash_create(const struct rte_hash_parameters *params);
 
 /**
  * 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;
 
 } DPDK_2.0;
+
+DPDK_2.2 {
+	global:
+
+	rte_hash_set_cmp_func;
+
+} DPDK_2.1;
-- 
1.9.1

[dpdk-dev] [PATCH v3 3/3] hash: put rte_hash_set_cmp_func() back to DPDK_2.1.

[Yu Nemo Wenbin]

Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
---
 lib/librte_hash/rte_hash_version.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
index 1aa94f9..6fab36d 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -30,6 +30,7 @@ DPDK_2.1 {
 	rte_hash_lookup_data;
 	rte_hash_lookup_with_hash_data;
 	rte_hash_reset;
+	rte_hash_set_cmp_func;
 
 } DPDK_2.0;
 
-- 
1.9.1

Re: [dpdk-dev] [PATCH v3 1/3] hash: add rte_hash_set_cmp_func() function.

[De Lara Guarch, Pablo]

Hi Nemo,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Yu Nemo Wenbin
> Sent: Friday, December 04, 2015 3:12 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v3 1/3] hash: add rte_hash_set_cmp_func()
> function.
> 
> Give user a chance to costomize 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 good enough, so the user
> may call this to override the default one.
> 
> Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>

What I meant with all the changes in one go is to include them in a single patch, not three,
where your starting point is the current code in mainline.
Please, check that the commit message is fixed as we discussed,
and that the new function is in DPDK_2.2, and not DPDK_2.1

Re: [dpdk-dev] [PATCH v3 1/3] hash: add rte_hash_set_cmp_func() function.

[Thomas Monjalon]

2015-12-04 08:54, De Lara Guarch, Pablo:
> Hi Nemo,
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Yu Nemo Wenbin
> > Give user a chance to costomize 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 good enough, so the user
> > may call this to override the default one.
> > 
> > Signed-off-by: Yu Nemo Wenbin <yuwb_bjy@ctbri.com.cn>
> 
> What I meant with all the changes in one go is to include them in a single patch, not three,
> where your starting point is the current code in mainline.
> Please, check that the commit message is fixed as we discussed,
> and that the new function is in DPDK_2.2, and not DPDK_2.1

I think I've understood what Nemo wants to do.
I've fixed the indent, fixed the doxygen comment and dropped the third patch.
At the end, applied with your previous ack.