X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=f3c96880fc6dc12c920a204bf284be14f688c16c;hb=33c7c748c098dfc963c934fde62328169834c1ed;hp=7605036555f9526cfafbc8a1265ba4d732499a97;hpb=df03fab8d93f4778ff06cad3e6aef2a61c65170c;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index 7605036..f3c9688 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -76,7 +76,7 @@ struct rcu_ht {
 	ht_compare_fct compare_fct;
 	unsigned long hash_seed;
 	pthread_mutex_t resize_mutex;	/* resize mutex: add/del mutex */
-	unsigned int in_progress_resize;
+	unsigned int in_progress_resize, in_progress_destroy;
 	void (*ht_call_rcu)(struct rcu_head *head,
 		      void (*func)(struct rcu_head *head));
 };
@@ -525,10 +525,14 @@ void init_table(struct rcu_ht *ht, struct rcu_table *t,
 			new_node->p.reverse_hash =
 				bit_reverse_ulong(!i ? 0 : (1UL << (i - 1)) + j);
 			(void) _ht_add(ht, t, new_node, 0, 1);
+			if (CMM_LOAD_SHARED(ht->in_progress_destroy))
+				break;
 		}
 		/* Update table size */
 		t->size = !i ? 1 : (1UL << i);
 		dbg_printf("rculfhash: init new size: %lu\n", t->size);
+		if (CMM_LOAD_SHARED(ht->in_progress_destroy))
+			break;
 	}
 	t->resize_target = t->size;
 	t->resize_initiated = 0;
@@ -673,6 +677,7 @@ int ht_destroy(struct rcu_ht *ht)
 	int ret;
 
 	/* Wait for in-flight resize operations to complete */
+	CMM_STORE_SHARED(ht->in_progress_destroy, 1);
 	while (uatomic_read(&ht->in_progress_resize))
 		poll(NULL, 0, 100);	/* wait for 100ms */
 	ret = ht_delete_dummy(ht);