[lttng-dev] [PATCH 08/12] use rcu_flavor for rculfhash

Mathieu Desnoyers mathieu.desnoyers at efficios.com
Mon Nov 28 08:24:45 EST 2011


* Lai Jiangshan (laijs at cn.fujitsu.com) wrote:
> Make the sizeof(struct cds_lfht) smaller
> 
> Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>

Merged, thanks!

Mathieu

> ---
>  rculfhash.c      |   64 +++++++++++++++++------------------------------------
>  urcu/rculfhash.h |   18 +++-----------
>  2 files changed, 25 insertions(+), 57 deletions(-)
> 
> diff --git a/rculfhash.c b/rculfhash.c
> index 4a611a1..18cead3 100644
> --- a/rculfhash.c
> +++ b/rculfhash.c
> @@ -160,6 +160,7 @@
>  #include "config.h"
>  #include <urcu.h>
>  #include <urcu-call-rcu.h>
> +#include <urcu-flavor.h>
>  #include <urcu/arch.h>
>  #include <urcu/uatomic.h>
>  #include <urcu/compiler.h>
> @@ -278,15 +279,7 @@ struct cds_lfht {
>  	 */
>  	pthread_mutex_t resize_mutex;	/* resize mutex: add/del mutex */
>  	unsigned int in_progress_resize, in_progress_destroy;
> -	void (*cds_lfht_call_rcu)(struct rcu_head *head,
> -		      void (*func)(struct rcu_head *head));
> -	void (*cds_lfht_synchronize_rcu)(void);
> -	void (*cds_lfht_rcu_read_lock)(void);
> -	void (*cds_lfht_rcu_read_unlock)(void);
> -	void (*cds_lfht_rcu_thread_offline)(void);
> -	void (*cds_lfht_rcu_thread_online)(void);
> -	void (*cds_lfht_rcu_register_thread)(void);
> -	void (*cds_lfht_rcu_unregister_thread)(void);
> +	const struct rcu_flavor_struct *flavor;
>  	pthread_attr_t *resize_attr;	/* Resize threads attributes */
>  	long count;			/* global approximate item count */
>  	struct ht_items_count *split_count;	/* split item count */
> @@ -1075,9 +1068,9 @@ void *partition_resize_thread(void *arg)
>  {
>  	struct partition_resize_work *work = arg;
>  
> -	work->ht->cds_lfht_rcu_register_thread();
> +	work->ht->flavor->register_thread();
>  	work->fct(work->ht, work->i, work->start, work->len);
> -	work->ht->cds_lfht_rcu_unregister_thread();
> +	work->ht->flavor->unregister_thread();
>  	return NULL;
>  }
>  
> @@ -1141,7 +1134,7 @@ void init_table_populate_partition(struct cds_lfht *ht, unsigned long i,
>  	unsigned long j, size = 1UL << (i - 1);
>  
>  	assert(i > MIN_TABLE_ORDER);
> -	ht->cds_lfht_rcu_read_lock();
> +	ht->flavor->read_lock();
>  	for (j = size + start; j < size + start + len; j++) {
>  		struct cds_lfht_node *new_node = bucket_at(ht, j);
>  
> @@ -1151,7 +1144,7 @@ void init_table_populate_partition(struct cds_lfht *ht, unsigned long i,
>  		new_node->reverse_hash = bit_reverse_ulong(j);
>  		_cds_lfht_add(ht, NULL, NULL, size, new_node, NULL, 1);
>  	}
> -	ht->cds_lfht_rcu_read_unlock();
> +	ht->flavor->read_unlock();
>  }
>  
>  static
> @@ -1160,9 +1153,9 @@ void init_table_populate(struct cds_lfht *ht, unsigned long i,
>  {
>  	assert(nr_cpus_mask != -1);
>  	if (nr_cpus_mask < 0 || len < 2 * MIN_PARTITION_PER_THREAD) {
> -		ht->cds_lfht_rcu_thread_online();
> +		ht->flavor->thread_online();
>  		init_table_populate_partition(ht, i, 0, len);
> -		ht->cds_lfht_rcu_thread_offline();
> +		ht->flavor->thread_offline();
>  		return;
>  	}
>  	partition_resize_helper(ht, i, len, init_table_populate_partition);
> @@ -1239,7 +1232,7 @@ void remove_table_partition(struct cds_lfht *ht, unsigned long i,
>  	unsigned long j, size = 1UL << (i - 1);
>  
>  	assert(i > MIN_TABLE_ORDER);
> -	ht->cds_lfht_rcu_read_lock();
> +	ht->flavor->read_lock();
>  	for (j = size + start; j < size + start + len; j++) {
>  		struct cds_lfht_node *fini_node = bucket_at(ht, j);
>  
> @@ -1249,7 +1242,7 @@ void remove_table_partition(struct cds_lfht *ht, unsigned long i,
>  		fini_node->reverse_hash = bit_reverse_ulong(j);
>  		(void) _cds_lfht_del(ht, size, fini_node, 1);
>  	}
> -	ht->cds_lfht_rcu_read_unlock();
> +	ht->flavor->read_unlock();
>  }
>  
>  static
> @@ -1258,9 +1251,9 @@ void remove_table(struct cds_lfht *ht, unsigned long i, unsigned long len)
>  
>  	assert(nr_cpus_mask != -1);
>  	if (nr_cpus_mask < 0 || len < 2 * MIN_PARTITION_PER_THREAD) {
> -		ht->cds_lfht_rcu_thread_online();
> +		ht->flavor->thread_online();
>  		remove_table_partition(ht, i, 0, len);
> -		ht->cds_lfht_rcu_thread_offline();
> +		ht->flavor->thread_offline();
>  		return;
>  	}
>  	partition_resize_helper(ht, i, len, remove_table_partition);
> @@ -1295,7 +1288,7 @@ void fini_table(struct cds_lfht *ht,
>  		 * releasing the old bucket nodes. Otherwise their lookup will
>  		 * return a logically removed node as insert position.
>  		 */
> -		ht->cds_lfht_synchronize_rcu();
> +		ht->flavor->update_synchronize_rcu();
>  		if (free_by_rcu_order)
>  			cds_lfht_free_bucket_table(ht, free_by_rcu_order);
>  
> @@ -1315,7 +1308,7 @@ void fini_table(struct cds_lfht *ht,
>  	}
>  
>  	if (free_by_rcu_order) {
> -		ht->cds_lfht_synchronize_rcu();
> +		ht->flavor->update_synchronize_rcu();
>  		cds_lfht_free_bucket_table(ht, free_by_rcu_order);
>  	}
>  }
> @@ -1368,15 +1361,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
>  			unsigned long min_nr_alloc_buckets,
>  			unsigned long max_nr_buckets,
>  			int flags,
> -			void (*cds_lfht_call_rcu)(struct rcu_head *head,
> -					void (*func)(struct rcu_head *head)),
> -			void (*cds_lfht_synchronize_rcu)(void),
> -			void (*cds_lfht_rcu_read_lock)(void),
> -			void (*cds_lfht_rcu_read_unlock)(void),
> -			void (*cds_lfht_rcu_thread_offline)(void),
> -			void (*cds_lfht_rcu_thread_online)(void),
> -			void (*cds_lfht_rcu_register_thread)(void),
> -			void (*cds_lfht_rcu_unregister_thread)(void),
> +			const struct rcu_flavor_struct *flavor,
>  			pthread_attr_t *attr)
>  {
>  	struct cds_lfht *ht;
> @@ -1404,14 +1389,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
>  	ht = calloc(1, sizeof(struct cds_lfht));
>  	assert(ht);
>  	ht->flags = flags;
> -	ht->cds_lfht_call_rcu = cds_lfht_call_rcu;
> -	ht->cds_lfht_synchronize_rcu = cds_lfht_synchronize_rcu;
> -	ht->cds_lfht_rcu_read_lock = cds_lfht_rcu_read_lock;
> -	ht->cds_lfht_rcu_read_unlock = cds_lfht_rcu_read_unlock;
> -	ht->cds_lfht_rcu_thread_offline = cds_lfht_rcu_thread_offline;
> -	ht->cds_lfht_rcu_thread_online = cds_lfht_rcu_thread_online;
> -	ht->cds_lfht_rcu_register_thread = cds_lfht_rcu_register_thread;
> -	ht->cds_lfht_rcu_unregister_thread = cds_lfht_rcu_unregister_thread;
> +	ht->flavor = flavor;
>  	ht->resize_attr = attr;
>  	alloc_split_items_count(ht);
>  	/* this mutex should not nest in read-side C.S. */
> @@ -1788,11 +1766,11 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size)
>  {
>  	resize_target_update_count(ht, new_size);
>  	CMM_STORE_SHARED(ht->t.resize_initiated, 1);
> -	ht->cds_lfht_rcu_thread_offline();
> +	ht->flavor->thread_offline();
>  	pthread_mutex_lock(&ht->resize_mutex);
>  	_do_cds_lfht_resize(ht);
>  	pthread_mutex_unlock(&ht->resize_mutex);
> -	ht->cds_lfht_rcu_thread_online();
> +	ht->flavor->thread_online();
>  }
>  
>  static
> @@ -1802,11 +1780,11 @@ void do_resize_cb(struct rcu_head *head)
>  		caa_container_of(head, struct rcu_resize_work, head);
>  	struct cds_lfht *ht = work->ht;
>  
> -	ht->cds_lfht_rcu_thread_offline();
> +	ht->flavor->thread_offline();
>  	pthread_mutex_lock(&ht->resize_mutex);
>  	_do_cds_lfht_resize(ht);
>  	pthread_mutex_unlock(&ht->resize_mutex);
> -	ht->cds_lfht_rcu_thread_online();
> +	ht->flavor->thread_online();
>  	poison_free(work);
>  	cmm_smp_mb();	/* finish resize before decrement */
>  	uatomic_dec(&ht->in_progress_resize);
> @@ -1828,7 +1806,7 @@ void __cds_lfht_resize_lazy_launch(struct cds_lfht *ht)
>  		}
>  		work = malloc(sizeof(*work));
>  		work->ht = ht;
> -		ht->cds_lfht_call_rcu(&work->head, do_resize_cb);
> +		ht->flavor->update_call_rcu(&work->head, do_resize_cb);
>  		CMM_STORE_SHARED(ht->t.resize_initiated, 1);
>  	}
>  }
> diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
> index bff883f..a886b04 100644
> --- a/urcu/rculfhash.h
> +++ b/urcu/rculfhash.h
> @@ -29,6 +29,7 @@
>  #include <stdint.h>
>  #include <urcu/compiler.h>
>  #include <urcu-call-rcu.h>
> +#include <urcu-flavor.h>
>  
>  #ifdef __cplusplus
>  extern "C" {
> @@ -101,15 +102,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
>  			unsigned long min_nr_alloc_buckets,
>  			unsigned long max_nr_buckets,
>  			int flags,
> -			void (*cds_lfht_call_rcu)(struct rcu_head *head,
> -				void (*func)(struct rcu_head *head)),
> -			void (*cds_lfht_synchronize_rcu)(void),
> -			void (*cds_lfht_rcu_read_lock)(void),
> -			void (*cds_lfht_rcu_read_unlock)(void),
> -			void (*cds_lfht_rcu_thread_offline)(void),
> -			void (*cds_lfht_rcu_thread_online)(void),
> -			void (*cds_lfht_rcu_register_thread)(void),
> -			void (*cds_lfht_rcu_unregister_thread)(void),
> +			const struct rcu_flavor_struct *flavor,
>  			pthread_attr_t *attr);
>  
>  /*
> @@ -144,11 +137,8 @@ struct cds_lfht *cds_lfht_new(unsigned long init_size,
>  			int flags,
>  			pthread_attr_t *attr)
>  {
> -	return _cds_lfht_new(init_size, min_nr_alloc_buckets, max_nr_buckets, flags,
> -			call_rcu, synchronize_rcu, rcu_read_lock,
> -			rcu_read_unlock, rcu_thread_offline,
> -			rcu_thread_online, rcu_register_thread,
> -			rcu_unregister_thread, attr);
> +	return _cds_lfht_new(init_size, min_nr_alloc_buckets, max_nr_buckets,
> +			flags, &rcu_flavor, attr);
>  }
>  
>  /*
> -- 
> 1.7.4.4
> 

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



More information about the lttng-dev mailing list