X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=rculfhash.c;h=75e5ece96c9edb3e462b861fe61e682561d7a1c4;hb=bc8c3c74b84e838b195faa8871344f5b672ae1cd;hp=5220cd5fd804321cf2b9b725c87b9e54d58296f2;hpb=db00ccc36e7fb04ce8044fb1be7964acd1de6ae0;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index 5220cd5..75e5ece 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -929,8 +929,7 @@ end:
 
 static
 int _cds_lfht_del(struct cds_lfht *ht, unsigned long size,
-		struct cds_lfht_node *node,
-		int bucket_removal)
+		struct cds_lfht_node *node)
 {
 	struct cds_lfht_node *bucket, *next;
 
@@ -951,10 +950,7 @@ int _cds_lfht_del(struct cds_lfht *ht, unsigned long size,
 	next = rcu_dereference(node->next);
 	if (caa_unlikely(is_removed(next)))
 		return -ENOENT;
-	if (bucket_removal)
-		assert(is_bucket(next));
-	else
-		assert(!is_bucket(next));
+	assert(!is_bucket(next));
 	/*
 	 * We set the REMOVED_FLAG unconditionally. Note that there may
 	 * be more than one concurrent thread setting this flag.
@@ -1531,15 +1527,15 @@ int cds_lfht_replace(struct cds_lfht *ht, struct cds_lfht_iter *old_iter,
 			new_node);
 }
 
-int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_iter *iter)
+int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_node *node)
 {
 	unsigned long size, hash;
 	int ret;
 
 	size = rcu_dereference(ht->size);
-	ret = _cds_lfht_del(ht, size, iter->node, 0);
+	ret = _cds_lfht_del(ht, size, node);
 	if (!ret) {
-		hash = bit_reverse_ulong(iter->node->reverse_hash);
+		hash = bit_reverse_ulong(node->reverse_hash);
 		ht_count_del(ht, size, hash);
 	}
 	return ret;
@@ -1604,11 +1600,10 @@ int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr)
 void cds_lfht_count_nodes(struct cds_lfht *ht,
 		long *approx_before,
 		unsigned long *count,
-		unsigned long *removed,
 		long *approx_after)
 {
 	struct cds_lfht_node *node, *next;
-	unsigned long nr_bucket = 0;
+	unsigned long nr_bucket = 0, nr_removed = 0;
 
 	*approx_before = 0;
 	if (ht->split_count) {
@@ -1621,7 +1616,6 @@ void cds_lfht_count_nodes(struct cds_lfht *ht,
 	}
 
 	*count = 0;
-	*removed = 0;
 
 	/* Count non-bucket nodes in the table */
 	node = bucket_at(ht, 0);
@@ -1629,7 +1623,7 @@ void cds_lfht_count_nodes(struct cds_lfht *ht,
 		next = rcu_dereference(node->next);
 		if (is_removed(next)) {
 			if (!is_bucket(next))
-				(*removed)++;
+				(nr_removed)++;
 			else
 				(nr_bucket)++;
 		} else if (!is_bucket(next))
@@ -1638,6 +1632,7 @@ void cds_lfht_count_nodes(struct cds_lfht *ht,
 			(nr_bucket)++;
 		node = clear_flag(next);
 	} while (!is_end(node));
+	dbg_printf("number of logically removed nodes: %lu\n", nr_removed);
 	dbg_printf("number of bucket nodes: %lu\n", nr_bucket);
 	*approx_after = 0;
 	if (ht->split_count) {