[ltt-dev] [PATCH 5/7] rculfhash: Pass hash value to cds_lfht_add* APIs

[mathieu.desnoyers@efficios.com (Mathieu Desnoyers)]

* Lai Jiangshan (laijs at cn.fujitsu.com) wrote:
> Pass hash value to cds_lfht_add* APIs instead of calculation it in rculfhash.c.
> Prepare for future work for moving key out of struct cds_lfht_node.

This has also been done within commit
0422d92c2d658f6093b8209f75808efd2109a110.

Thanks,

Mathieu

> 
> Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
> ---
>  rculfhash.c            |   16 +++++++---------
>  tests/test_urcu_hash.c |   38 ++++++++++++++++++++++++++++++++------
>  urcu/rculfhash.h       |    7 ++++---
>  3 files changed, 43 insertions(+), 18 deletions(-)
> 
> diff --git a/rculfhash.c b/rculfhash.c
> index 9745129..6a8c720 100644
> --- a/rculfhash.c
> +++ b/rculfhash.c
> @@ -1502,11 +1502,11 @@ void cds_lfht_first(struct cds_lfht *ht, struct cds_lfht_iter *iter)
>  	cds_lfht_next(ht, iter);
>  }
>  
> -void cds_lfht_add(struct cds_lfht *ht, struct cds_lfht_node *node)
> +void cds_lfht_add(struct cds_lfht *ht, unsigned long hash,
> +		struct cds_lfht_node *node)
>  {
> -	unsigned long hash, size;
> +	unsigned long size;
>  
> -	hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
>  	node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
>  
>  	size = rcu_dereference(ht->t.size);
> @@ -1515,12 +1515,11 @@ void cds_lfht_add(struct cds_lfht *ht, struct cds_lfht_node *node)
>  }
>  
>  struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
> -				struct cds_lfht_node *node)
> +		unsigned long hash, struct cds_lfht_node *node)
>  {
> -	unsigned long hash, size;
> +	unsigned long size;
>  	struct cds_lfht_iter iter;
>  
> -	hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
>  	node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
>  
>  	size = rcu_dereference(ht->t.size);
> @@ -1531,12 +1530,11 @@ struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
>  }
>  
>  struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
> -				struct cds_lfht_node *node)
> +		unsigned long hash, struct cds_lfht_node *node)
>  {
> -	unsigned long hash, size;
> +	unsigned long size;
>  	struct cds_lfht_iter iter;
>  
> -	hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
>  	node->p.reverse_hash = bit_reverse_ulong((unsigned long) hash);
>  
>  	size = rcu_dereference(ht->t.size);
> diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
> index 9689878..1cae6d6 100644
> --- a/tests/test_urcu_hash.c
> +++ b/tests/test_urcu_hash.c
> @@ -444,6 +444,32 @@ void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
>  			test_match, key, iter);
>  }
>  
> +static
> +void cds_lfht_test_add(struct cds_lfht *ht, struct lfht_test_node *node)
> +{
> +	unsigned long hash = test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED);
> +
> +	cds_lfht_add(ht, hash, &node->node);
> +}
> +
> +static
> +struct cds_lfht_node *cds_lfht_test_add_unique(struct cds_lfht *ht,
> +		struct lfht_test_node *node)
> +{
> +	unsigned long hash = test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED);
> +
> +	return cds_lfht_add_unique(ht, hash, &node->node);
> +}
> +
> +static
> +struct cds_lfht_node *cds_lfht_test_add_replace(struct cds_lfht *ht,
> +		struct lfht_test_node *node)
> +{
> +	unsigned long hash = test_hash(node->node.key, node->node.key_len, TEST_HASH_SEED);
> +
> +	return cds_lfht_add_replace(ht, hash, &node->node);
> +}
> +
>  void *thr_count(void *arg)
>  {
>  	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
> @@ -576,12 +602,12 @@ void *thr_writer(void *_count)
>  				sizeof(void *));
>  			rcu_read_lock();
>  			if (add_unique) {
> -				ret_node = cds_lfht_add_unique(test_ht, &node->node);
> +				ret_node = cds_lfht_test_add_unique(test_ht, node);
>  			} else {
>  				if (add_replace)
> -					ret_node = cds_lfht_add_replace(test_ht, &node->node);
> +					ret_node = cds_lfht_test_add_replace(test_ht, node);
>  				else
> -					cds_lfht_add(test_ht, &node->node);
> +					cds_lfht_test_add(test_ht, node);
>  			}
>  			rcu_read_unlock();
>  			if (add_unique && ret_node != &node->node) {
> @@ -667,12 +693,12 @@ static int populate_hash(void)
>  			sizeof(void *));
>  		rcu_read_lock();
>  		if (add_unique) {
> -			ret_node = cds_lfht_add_unique(test_ht, &node->node);
> +			ret_node = cds_lfht_test_add_unique(test_ht, node);
>  		} else {
>  			if (add_replace)
> -				ret_node = cds_lfht_add_replace(test_ht, &node->node);
> +				ret_node = cds_lfht_test_add_replace(test_ht, node);
>  			else
> -				cds_lfht_add(test_ht, &node->node);
> +				cds_lfht_test_add(test_ht, node);
>  		}
>  		rcu_read_unlock();
>  		if (add_unique && ret_node != &node->node) {
> diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
> index c6946dc..d4c9209 100644
> --- a/urcu/rculfhash.h
> +++ b/urcu/rculfhash.h
> @@ -248,7 +248,8 @@ void cds_lfht_next(struct cds_lfht *ht, struct cds_lfht_iter *iter);
>   * Call with rcu_read_lock held.
>   * Threads calling this API need to be registered RCU read-side threads.
>   */
> -void cds_lfht_add(struct cds_lfht *ht, struct cds_lfht_node *node);
> +void cds_lfht_add(struct cds_lfht *ht, unsigned long hash,
> +		struct cds_lfht_node *node);
>  
>  /*
>   * cds_lfht_add_unique - add a node to hash table, if key is not present.
> @@ -266,7 +267,7 @@ void cds_lfht_add(struct cds_lfht *ht, struct cds_lfht_node *node);
>   * add_unique and add_replace (see below).
>   */
>  struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
> -		struct cds_lfht_node *node);
> +		unsigned long hash, struct cds_lfht_node *node);
>  
>  /*
>   * cds_lfht_add_replace - replace or add a node within hash table.
> @@ -290,7 +291,7 @@ struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
>   * will never generate duplicated keys.
>   */
>  struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
> -		struct cds_lfht_node *node);
> +		unsigned long hash, struct cds_lfht_node *node);
>  
>  /*
>   * cds_lfht_replace - replace a node pointer to by iter within hash table.
> -- 
> 1.7.4.4
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com