rename min_alloc_size/min_alloc_order

[ Mathieu Desnoyers:

  This clarifies that the amount of buckets allocated can differ from
  the number of buckets chained together, especially for small hash
  tables, where we don't free under min_nr_alloc_buckets. ]

Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/rculfhash.c b/rculfhash.c
index fd9241d613b964766e33463327fa3d5a15afe3aa..8282f09256e7bbec6384e91cd630692b4e524e2f 100644 (file)
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -265,8 +265,8 @@ struct rcu_table {
  */
 struct cds_lfht {
        struct rcu_table t;
-       unsigned long min_alloc_order;
-       unsigned long min_alloc_size;
+       unsigned long min_alloc_buckets_order;
+       unsigned long min_nr_alloc_buckets;
        int flags;
        /*
         * We need to put the work threads offline (QSBR) when taking this
@@ -757,15 +757,15 @@ static
 void cds_lfht_alloc_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
        if (order == 0) {
-               ht->t.tbl[0] = calloc(ht->min_alloc_size,
+               ht->t.tbl[0] = calloc(ht->min_nr_alloc_buckets,
                        sizeof(struct cds_lfht_node));
                assert(ht->t.tbl[0]);
-       } else if (order > ht->min_alloc_order) {
+       } else if (order > ht->min_alloc_buckets_order) {
                ht->t.tbl[order] = calloc(1UL << (order -1),
                        sizeof(struct cds_lfht_node));
                assert(ht->t.tbl[order]);
        }
-       /* Nothing to do for 0 < order && order <= ht->min_alloc_order */
+       /* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
 }
 
 /*
@@ -778,9 +778,9 @@ void cds_lfht_free_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
        if (order == 0)
                poison_free(ht->t.tbl[0]);
-       else if (order > ht->min_alloc_order)
+       else if (order > ht->min_alloc_buckets_order)
                poison_free(ht->t.tbl[order]);
-       /* Nothing to do for 0 < order && order <= ht->min_alloc_order */
+       /* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
 }
 
 static inline
@@ -789,7 +789,7 @@ struct cds_lfht_node *bucket_at(struct cds_lfht *ht, unsigned long index)
        unsigned long order;
 
        if ((__builtin_constant_p(index) && index == 0)
-                       || index < ht->min_alloc_size) {
+                       || index < ht->min_nr_alloc_buckets) {
                dbg_printf("bucket index %lu order 0 aridx 0\n", index);
                return &ht->t.tbl[0][index];
        }
@@ -1364,7 +1364,7 @@ void cds_lfht_create_bucket(struct cds_lfht *ht, unsigned long size)
 }
 
 struct cds_lfht *_cds_lfht_new(unsigned long init_size,
-                       unsigned long min_alloc_size,
+                       unsigned long min_nr_alloc_buckets,
                        int flags,
                        void (*cds_lfht_call_rcu)(struct rcu_head *head,
                                        void (*func)(struct rcu_head *head)),
@@ -1380,13 +1380,13 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
        struct cds_lfht *ht;
        unsigned long order;
 
-       /* min_alloc_size must be power of two */
-       if (!min_alloc_size || (min_alloc_size & (min_alloc_size - 1)))
+       /* min_nr_alloc_buckets must be power of two */
+       if (!min_nr_alloc_buckets || (min_nr_alloc_buckets & (min_nr_alloc_buckets - 1)))
                return NULL;
        /* init_size must be power of two */
        if (!init_size || (init_size & (init_size - 1)))
                return NULL;
-       min_alloc_size = max(min_alloc_size, MIN_TABLE_SIZE);
+       min_nr_alloc_buckets = max(min_nr_alloc_buckets, MIN_TABLE_SIZE);
        init_size = max(init_size, MIN_TABLE_SIZE);
        ht = calloc(1, sizeof(struct cds_lfht));
        assert(ht);
@@ -1405,8 +1405,8 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
        pthread_mutex_init(&ht->resize_mutex, NULL);
        order = get_count_order_ulong(init_size);
        ht->t.resize_target = 1UL << order;
-       ht->min_alloc_size = min_alloc_size;
-       ht->min_alloc_order = get_count_order_ulong(min_alloc_size);
+       ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
+       ht->min_alloc_buckets_order = get_count_order_ulong(min_nr_alloc_buckets);
        cds_lfht_create_bucket(ht, 1UL << order);
        ht->t.size = 1UL << order;
        return ht;

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index d3018b7e438b6446ebac56bfa4bdc41ef695704d..d242ff6485addffd97d05a8bfbba803681656944 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -98,7 +98,7 @@ enum {
  * _cds_lfht_new - API used by cds_lfht_new wrapper. Do not use directly.
  */
 struct cds_lfht *_cds_lfht_new(unsigned long init_size,
-                       unsigned long min_alloc_size,
+                       unsigned long min_nr_alloc_buckets,
                        int flags,
                        void (*cds_lfht_call_rcu)(struct rcu_head *head,
                                void (*func)(struct rcu_head *head)),
@@ -114,7 +114,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
 /*
  * cds_lfht_new - allocate a hash table.
  * @init_size: number of nodes to allocate initially. Must be power of two.
- * @min_alloc_size: the smallest allocation size to use. Must be power of two.
+ * @min_nr_alloc_buckets: the smallest allocation size to use. Must be power of two.
  * @flags: hash table creation flags (can be combined with bitwise or: '|').
  *           0: no flags.
  *           CDS_LFHT_AUTO_RESIZE: automatically resize hash table.
@@ -137,11 +137,11 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
  */
 static inline
 struct cds_lfht *cds_lfht_new(unsigned long init_size,
-                       unsigned long min_alloc_size,
+                       unsigned long min_nr_alloc_buckets,
                        int flags,
                        pthread_attr_t *attr)
 {
-       return _cds_lfht_new(init_size, min_alloc_size, flags,
+       return _cds_lfht_new(init_size, min_nr_alloc_buckets, flags,
                        call_rcu, synchronize_rcu, rcu_read_lock,
                        rcu_read_unlock, rcu_thread_offline,
                        rcu_thread_online, rcu_register_thread,