X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=rculfhash.c;h=13274189887182f81a2a8ed5336db50a36e13c90;hp=03209623de816e6ad2a6668989706f9b362860ce;hb=5737ee5083d38e6994ad84ead60005e53839635c;hpb=276c2fc88c222b5a7c534d21a271564c0bb57935

diff --git a/rculfhash.c b/rculfhash.c
index 0320962..1327418 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -255,7 +255,6 @@ struct rcu_resize_work {
 };
 
 struct partition_resize_work {
-	struct rcu_head head;
 	struct cds_lfht *ht;
 	unsigned long i, start, len;
 	void (*fct)(struct cds_lfht *ht, unsigned long i,
@@ -1097,8 +1096,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 +1197,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();
 }
@@ -1542,7 +1537,8 @@ int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr)
 	int ret;
 
 	/* Wait for in-flight resize operations to complete */
-	CMM_STORE_SHARED(ht->in_progress_destroy, 1);
+	_CMM_STORE_SHARED(ht->in_progress_destroy, 1);
+	cmm_smp_mb();	/* Store destroy before load resize */
 	while (uatomic_read(&ht->in_progress_resize))
 		poll(NULL, 0, 100);	/* wait for 100ms */
 	ret = cds_lfht_delete_dummy(ht);
@@ -1650,6 +1646,9 @@ 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;
 		old_size = ht->t.size;
 		new_size = CMM_LOAD_SHARED(ht->t.resize_target);
@@ -1718,7 +1717,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);
@@ -1741,7 +1744,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);