Merge branch 'master' into urcu/ht-shrink
[urcu.git] / rculfhash.c
index d1a17669f9fa176660b9552241808f2760f6bdcc..600feecfa8f4f8230eede1683cf79cff14a0333f 100644 (file)
@@ -534,7 +534,7 @@ int get_count_order_ulong(unsigned long x)
 #endif
 
 static
-void cds_lfht_resize_lazy(struct cds_lfht *ht, unsigned long size, int growth);
+void cds_lfht_resize_lazy_grow(struct cds_lfht *ht, unsigned long size, int growth);
 
 static
 void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
@@ -695,7 +695,7 @@ void check_resize(struct cds_lfht *ht, unsigned long size, uint32_t chain_len)
                dbg_printf("WARNING: large chain length: %u.\n",
                           chain_len);
        if (chain_len >= CHAIN_LEN_RESIZE_THRESHOLD)
-               cds_lfht_resize_lazy(ht, size,
+               cds_lfht_resize_lazy_grow(ht, size,
                        get_count_order_u32(chain_len - (CHAIN_LEN_TARGET - 1)));
 }
 
@@ -742,7 +742,8 @@ int is_end(struct cds_lfht_node *node)
 }
 
 static
-unsigned long _uatomic_max(unsigned long *ptr, unsigned long v)
+unsigned long _uatomic_xchg_monotonic_increase(unsigned long *ptr,
+               unsigned long v)
 {
        unsigned long old1, old2;
 
@@ -752,7 +753,7 @@ unsigned long _uatomic_max(unsigned long *ptr, unsigned long v)
                if (old2 >= v)
                        return old2;
        } while ((old1 = uatomic_cmpxchg(ptr, old2, v)) != old2);
-       return v;
+       return old2;
 }
 
 static
@@ -1753,11 +1754,9 @@ void _do_cds_lfht_resize(struct cds_lfht *ht)
 }
 
 static
-unsigned long resize_target_update(struct cds_lfht *ht, unsigned long size,
-                                  int growth_order)
+unsigned long resize_target_grow(struct cds_lfht *ht, unsigned long new_size)
 {
-       return _uatomic_max(&ht->t.resize_target,
-                           size << growth_order);
+       return _uatomic_xchg_monotonic_increase(&ht->t.resize_target, new_size);
 }
 
 static
@@ -1797,15 +1796,13 @@ void do_resize_cb(struct rcu_head *head)
 }
 
 static
-void cds_lfht_resize_lazy(struct cds_lfht *ht, unsigned long size, int growth)
+void __cds_lfht_resize_lazy_launch(struct cds_lfht *ht)
 {
        struct rcu_resize_work *work;
-       unsigned long target_size;
 
-       target_size = resize_target_update(ht, size, growth);
        /* Store resize_target before read resize_initiated */
        cmm_smp_mb();
-       if (!CMM_LOAD_SHARED(ht->t.resize_initiated) && size < target_size) {
+       if (!CMM_LOAD_SHARED(ht->t.resize_initiated)) {
                uatomic_inc(&ht->in_progress_resize);
                cmm_smp_mb();   /* increment resize count before load destroy */
                if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
@@ -1819,27 +1816,47 @@ void cds_lfht_resize_lazy(struct cds_lfht *ht, unsigned long size, int growth)
        }
 }
 
+static
+void cds_lfht_resize_lazy_grow(struct cds_lfht *ht, unsigned long size, int growth)
+{
+       unsigned long target_size = size << growth;
+
+       if (resize_target_grow(ht, target_size) >= target_size)
+               return;
+
+       __cds_lfht_resize_lazy_launch(ht);
+}
+
+/*
+ * We favor grow operations over shrink. A shrink operation never occurs
+ * if a grow operation is queued for lazy execution. A grow operation
+ * cancels any pending shrink lazy execution.
+ */
 static
 void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
                                unsigned long count)
 {
-       struct rcu_resize_work *work;
-
        if (!(ht->flags & CDS_LFHT_AUTO_RESIZE))
                return;
-       resize_target_update_count(ht, count);
-       /* Store resize_target before read resize_initiated */
-       cmm_smp_mb();
-       if (!CMM_LOAD_SHARED(ht->t.resize_initiated)) {
-               uatomic_inc(&ht->in_progress_resize);
-               cmm_smp_mb();   /* increment resize count before load destroy */
-               if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
-                       uatomic_dec(&ht->in_progress_resize);
+       count = max(count, ht->min_alloc_size);
+       if (count == size)
+               return;         /* Already the right size, no resize needed */
+       if (count > size) {     /* lazy grow */
+               if (resize_target_grow(ht, count) >= count)
                        return;
+       } else {                /* lazy shrink */
+               for (;;) {
+                       unsigned long s;
+
+                       s = uatomic_cmpxchg(&ht->t.resize_target, size, count);
+                       if (s == size)
+                               break;  /* no resize needed */
+                       if (s > size)
+                               return; /* growing is/(was just) in progress */
+                       if (s <= count)
+                               return; /* some other thread do shrink */
+                       size = s;
                }
-               work = malloc(sizeof(*work));
-               work->ht = ht;
-               ht->cds_lfht_call_rcu(&work->head, do_resize_cb);
-               CMM_STORE_SHARED(ht->t.resize_initiated, 1);
        }
+       __cds_lfht_resize_lazy_launch(ht);
 }
This page took 0.026138 seconds and 4 git commands to generate.