rename min_alloc_size/min_alloc_order

[urcu.git] / rculfhash.c

diff --git a/rculfhash.c b/rculfhash.c
index 807191593c6e7d7671b7ca6f236657771a7d3f32..8282f09256e7bbec6384e91cd630692b4e524e2f 100644 (file)
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -238,28 +238,24 @@ struct ht_items_count {
        unsigned long add, del;
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
-/*
- * rcu_level: Contains the per order-index-level bucket node table. The
- * size of each bucket node table is half the number of hashes contained
- * in this order (except for order 0). The minimum allocation size
- * parameter allows combining the bucket node arrays of the lowermost
- * levels to improve cache locality for small index orders.
- */
-struct rcu_level {
-       /* Note: manually update allocation length when adding a field */
-       struct cds_lfht_node nodes[0];
-};
-
 /*
  * rcu_table: Contains the size and desired new size if a resize
  * operation is in progress, as well as the statically-sized array of
- * rcu_level pointers.
+ * bucket table pointers.
  */
 struct rcu_table {
        unsigned long size;     /* always a power of 2, shared (RCU) */
        unsigned long resize_target;
        int resize_initiated;
-       struct rcu_level *tbl[MAX_TABLE_ORDER];
+
+       /*
+        * Contains the per order-index-level bucket node table. The size
+        * of each bucket node table is half the number of hashes contained
+        * in this order (except for order 0). The minimum allocation size
+        * parameter allows combining the bucket node arrays of the lowermost
+        * levels to improve cache locality for small index orders.
+        */
+       struct cds_lfht_node *tbl[MAX_TABLE_ORDER];
 };
 
 /*
@@ -269,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
@@ -761,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 */
 }
 
 /*
@@ -782,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
@@ -793,9 +789,9 @@ 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]->nodes[index];
+               return &ht->t.tbl[0][index];
        }
        /*
         * equivalent to get_count_order_ulong(index + 1), but optimizes
@@ -805,7 +801,7 @@ struct cds_lfht_node *bucket_at(struct cds_lfht *ht, unsigned long index)
        order = fls_ulong(index);
        dbg_printf("bucket index %lu order %lu aridx %lu\n",
                   index, order, index & ((1UL << (order - 1)) - 1));
-       return &ht->t.tbl[order]->nodes[index & ((1UL << (order - 1)) - 1)];
+       return &ht->t.tbl[order][index & ((1UL << (order - 1)) - 1)];
 }
 
 static inline
@@ -1368,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)),
@@ -1384,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);
@@ -1409,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;