X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=rculfhash.c;h=6a80049ddd1f783a21e117d63437eec5771ba514;hp=0b3996416c270072b069fe700764515165bc50b5;hb=53960c9f970e231b1ca5f53913b60d298540cf9a;hpb=e1a68f1d99b97020243da2c47a81c74705dc3381

diff --git a/rculfhash.c b/rculfhash.c
index 0b39964..6a80049 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -156,6 +156,9 @@
 #define dbg_printf(fmt, args...)
 #endif
 
+/* For testing */
+#define POISON_FREE
+
 /*
  * Per-CPU split-counters lazily update the global counter each 1024
  * addition/removal. It automatically keeps track of resize required.
@@ -418,6 +421,16 @@ int get_count_order_ulong(unsigned long x)
 	return order;
 }
 
+#ifdef POISON_FREE
+#define poison_free(ptr)				\
+	do {						\
+		memset(ptr, 0x42, sizeof(*(ptr)));	\
+		free(ptr);				\
+	} while (0)
+#else
+#define poison_free(ptr)	free(ptr)
+#endif
+
 static
 void cds_lfht_resize_lazy(struct cds_lfht *ht, struct rcu_table *t, int growth);
 
@@ -468,7 +481,7 @@ struct ht_items_count *alloc_per_cpu_items_count(void)
 static
 void free_per_cpu_items_count(struct ht_items_count *count)
 {
-	free(count);
+	poison_free(count);
 }
 
 static
@@ -644,7 +657,7 @@ void cds_lfht_free_table_cb(struct rcu_head *head)
 {
 	struct rcu_table *t =
 		caa_container_of(head, struct rcu_table, head);
-	free(t);
+	poison_free(t);
 }
 
 static
@@ -652,7 +665,7 @@ void cds_lfht_free_level(struct rcu_head *head)
 {
 	struct rcu_level *l =
 		caa_container_of(head, struct rcu_level, head);
-	free(l);
+	poison_free(l);
 }
 
 /*
@@ -662,15 +675,20 @@ static
 void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node)
 {
 	struct cds_lfht_node *iter_prev, *iter, *next, *new_next;
+	struct cds_lfht_node *iter_trace[64];
+	unsigned long trace_idx = 0;
 
+	memset(iter_trace, 0, sizeof(iter_trace));
 	assert(!is_dummy(dummy));
 	assert(!is_removed(dummy));
 	assert(!is_dummy(node));
 	assert(!is_removed(node));
 	for (;;) {
+		iter_trace[trace_idx++ & (64 - 1)] = (void *) 0x1;
 		iter_prev = dummy;
 		/* We can always skip the dummy node initially */
 		iter = rcu_dereference(iter_prev->p.next);
+		iter_trace[trace_idx++ & (64 - 1)] = iter;
 		assert(iter_prev->p.reverse_hash <= node->p.reverse_hash);
 		/*
 		 * We should never be called with dummy (start of chain)
@@ -689,6 +707,7 @@ void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node
 				break;
 			iter_prev = clear_flag(iter);
 			iter = next;
+			iter_trace[trace_idx++ & (64 - 1)] = iter;
 		}
 		assert(!is_removed(iter));
 		if (is_dummy(iter))
@@ -696,6 +715,7 @@ void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node
 		else
 			new_next = clear_flag(next);
 		(void) uatomic_cmpxchg(&iter_prev->p.next, iter, new_next);
+		iter_trace[trace_idx++ & (64 - 1)] = (void *) 0x2;
 	}
 }
 
@@ -1101,7 +1121,7 @@ int cds_lfht_delete_dummy(struct cds_lfht *ht)
 				bit_reverse_ulong(t->tbl[order]->nodes[i].reverse_hash));
 			assert(is_dummy(t->tbl[order]->nodes[i].next));
 		}
-		free(t->tbl[order]);
+		poison_free(t->tbl[order]);
 	}
 	return 0;
 }
@@ -1121,9 +1141,9 @@ int cds_lfht_destroy(struct cds_lfht *ht)
 	ret = cds_lfht_delete_dummy(ht);
 	if (ret)
 		return ret;
-	free(ht->t);
+	poison_free(ht->t);
 	free_per_cpu_items_count(ht->percpu_count);
-	free(ht);
+	poison_free(ht);
 	return ret;
 }
 
@@ -1275,7 +1295,7 @@ void do_resize_cb(struct rcu_head *head)
 	pthread_mutex_lock(&ht->resize_mutex);
 	_do_cds_lfht_resize(ht);
 	pthread_mutex_unlock(&ht->resize_mutex);
-	free(work);
+	poison_free(work);
 	cmm_smp_mb();	/* finish resize before decrement */
 	uatomic_dec(&ht->in_progress_resize);
 }