X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=efb1b22ce566c494c78fe3f74cafc83b33d5a9d1;hb=f96d597f3a04010d432c36b9bb07e910720000ab;hp=070bcaf7c52acf5687ef3f729a62f5e41572d4e1;hpb=24953e081b6cb2e0f4ce1de1c42664ece3c3ce1b;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index 070bcaf..efb1b22 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1097,8 +1097,6 @@ void init_table_populate_partition(struct cds_lfht *ht, unsigned long i,
 			bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
 		(void) _cds_lfht_add(ht, !i ? 0 : (1UL << (i - 1)),
 				new_node, ADD_DEFAULT, 1);
-		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
-			break;
 	}
 	ht->cds_lfht_rcu_read_unlock();
 }
@@ -1200,8 +1198,6 @@ void remove_table_partition(struct cds_lfht *ht, unsigned long i,
 			bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
 		(void) _cds_lfht_del(ht, !i ? 0 : (1UL << (i - 1)),
 				fini_node, 1);
-		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
-			break;
 	}
 	ht->cds_lfht_rcu_read_unlock();
 }
@@ -1651,6 +1647,7 @@ void _do_cds_lfht_resize(struct cds_lfht *ht)
 	 * Resize table, re-do if the target size has changed under us.
 	 */
 	do {
+		assert(uatomic_read(&ht->in_progress_resize));
 		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
 			break;
 		ht->t.resize_initiated = 1;
@@ -1721,7 +1718,11 @@ void cds_lfht_resize_lazy(struct cds_lfht *ht, unsigned long size, int growth)
 	cmm_smp_mb();
 	if (!CMM_LOAD_SHARED(ht->t.resize_initiated) && size < target_size) {
 		uatomic_inc(&ht->in_progress_resize);
-		cmm_smp_mb();	/* increment resize count before calling it */
+		cmm_smp_mb();	/* increment resize count before load destroy */
+		if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
+			uatomic_dec(&ht->in_progress_resize);
+			return;
+		}
 		work = malloc(sizeof(*work));
 		work->ht = ht;
 		ht->cds_lfht_call_rcu(&work->head, do_resize_cb);
@@ -1744,7 +1745,11 @@ void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
 	cmm_smp_mb();
 	if (!CMM_LOAD_SHARED(ht->t.resize_initiated)) {
 		uatomic_inc(&ht->in_progress_resize);
-		cmm_smp_mb();	/* increment resize count before calling it */
+		cmm_smp_mb();	/* increment resize count before load destroy */
+		if (CMM_LOAD_SHARED(ht->in_progress_destroy)) {
+			uatomic_dec(&ht->in_progress_resize);
+			return;
+		}
 		work = malloc(sizeof(*work));
 		work->ht = ht;
 		ht->cds_lfht_call_rcu(&work->head, do_resize_cb);