remove struct rcu_level

[urcu.git] / rculfhash.c

diff --git a/rculfhash.c b/rculfhash.c
index 46bfa7ae661439f404518439c7e8e132f5506541..fd9241d613b964766e33463327fa3d5a15afe3aa 100644 (file)
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -187,7 +187,8 @@
 /*
  * Define the minimum table size.
  */
-#define MIN_TABLE_SIZE                 1
+#define MIN_TABLE_ORDER                        0
+#define MIN_TABLE_SIZE                 (1UL << MIN_TABLE_ORDER)
 
 #if (CAA_BITS_PER_LONG == 32)
 #define MAX_TABLE_ORDER                        32
@@ -237,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];
 };
 
 /*
@@ -794,7 +791,7 @@ struct cds_lfht_node *bucket_at(struct cds_lfht *ht, unsigned long index)
        if ((__builtin_constant_p(index) && index == 0)
                        || index < ht->min_alloc_size) {
                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
@@ -804,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
@@ -1142,7 +1139,7 @@ void init_table_populate_partition(struct cds_lfht *ht, unsigned long i,
 {
        unsigned long j, size = 1UL << (i - 1);
 
-       assert(i > ht->min_alloc_order);
+       assert(i > MIN_TABLE_ORDER);
        ht->cds_lfht_rcu_read_lock();
        for (j = size + start; j < size + start + len; j++) {
                struct cds_lfht_node *new_node = bucket_at(ht, j);
@@ -1178,7 +1175,7 @@ void init_table(struct cds_lfht *ht,
 
        dbg_printf("init table: first_order %lu last_order %lu\n",
                   first_order, last_order);
-       assert(first_order > ht->min_alloc_order);
+       assert(first_order > MIN_TABLE_ORDER);
        for (i = first_order; i <= last_order; i++) {
                unsigned long len;
 
@@ -1240,7 +1237,7 @@ void remove_table_partition(struct cds_lfht *ht, unsigned long i,
 {
        unsigned long j, size = 1UL << (i - 1);
 
-       assert(i > ht->min_alloc_order);
+       assert(i > MIN_TABLE_ORDER);
        ht->cds_lfht_rcu_read_lock();
        for (j = size + start; j < size + start + len; j++) {
                struct cds_lfht_node *fini_node = bucket_at(ht, j);
@@ -1277,7 +1274,7 @@ void fini_table(struct cds_lfht *ht,
 
        dbg_printf("fini table: first_order %lu last_order %lu\n",
                   first_order, last_order);
-       assert(first_order > ht->min_alloc_order);
+       assert(first_order > MIN_TABLE_ORDER);
        for (i = last_order; i >= first_order; i--) {
                unsigned long len;
 
@@ -1390,7 +1387,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
        if (!init_size || (init_size & (init_size - 1)))
                return NULL;
        min_alloc_size = max(min_alloc_size, MIN_TABLE_SIZE);
-       init_size = max(init_size, min_alloc_size);
+       init_size = max(init_size, MIN_TABLE_SIZE);
        ht = calloc(1, sizeof(struct cds_lfht));
        assert(ht);
        ht->flags = flags;
@@ -1720,7 +1717,7 @@ void _do_cds_lfht_shrink(struct cds_lfht *ht,
 {
        unsigned long old_order, new_order;
 
-       new_size = max(new_size, ht->min_alloc_size);
+       new_size = max(new_size, MIN_TABLE_SIZE);
        old_order = get_count_order_ulong(old_size);
        new_order = get_count_order_ulong(new_size);
        dbg_printf("resize from %lu (order %lu) to %lu (order %lu) buckets\n",
@@ -1768,7 +1765,7 @@ static
 void resize_target_update_count(struct cds_lfht *ht,
                                unsigned long count)
 {
-       count = max(count, ht->min_alloc_size);
+       count = max(count, MIN_TABLE_SIZE);
        uatomic_set(&ht->t.resize_target, count);
 }
 
@@ -1843,7 +1840,7 @@ void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
 {
        if (!(ht->flags & CDS_LFHT_AUTO_RESIZE))
                return;
-       count = max(count, ht->min_alloc_size);
+       count = max(count, MIN_TABLE_SIZE);
        if (count == size)
                return;         /* Already the right size, no resize needed */
        if (count > size) {     /* lazy grow */