X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=556ec36ddab261625d3c3b412496718c790d0c0b;hb=18117871130163ec2b2fc73fda288b9ba26cd435;hp=a5e4d9feed5a0d3ed7ec074727cacb33f9641d23;hpb=3eca1b8cce5630bcbd865a8d30855c996bc021c3;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index a5e4d9f..556ec36 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -204,137 +204,138 @@ unsigned long _uatomic_max(unsigned long *ptr, unsigned long v)
 	return v;
 }
 
+/*
+ * Remove all logically deleted nodes from a bucket up to a certain node key.
+ */
 static
-int _ht_add(struct rcu_ht *ht, struct rcu_table *t, struct rcu_ht_node *node,
-	     int unique)
+void _ht_gc_bucket(struct rcu_ht_node *dummy, struct rcu_ht_node *node)
 {
-	struct rcu_ht_node *iter_prev, *iter, *iter_prev_next, *next;
+	struct rcu_ht_node *iter_prev, *iter, *next;
 
-	if (!t->size)
-		return 0;
+	for (;;) {
+		iter_prev = dummy;
+		/* We can always skip the dummy node initially */
+		iter = rcu_dereference(iter_prev->next);
+		assert(iter_prev->reverse_hash <= node->reverse_hash);
+		for (;;) {
+			if (unlikely(!iter))
+				return;
+			if (clear_flag(iter)->reverse_hash > node->reverse_hash)
+				return;
+			next = rcu_dereference(clear_flag(iter)->next);
+			if (is_removed(next))
+				break;
+			iter_prev = iter;
+			iter = next;
+		}
+		assert(!is_removed(iter));
+		(void) uatomic_cmpxchg(&iter_prev->next, iter, clear_flag(next));
+	}
+}
+
+static
+struct rcu_ht_node *_ht_add(struct rcu_ht *ht, struct rcu_table *t,
+			    struct rcu_ht_node *node, int unique)
+{
+	struct rcu_ht_node *iter_prev, *dummy, *iter, *next;
+	unsigned long hash;
+
+	if (!t->size) {
+		assert(node->dummy);
+		return node;	/* Initial first add (head) */
+	}
+	hash = bit_reverse_ulong(node->reverse_hash);
 	for (;;) {
 		uint32_t chain_len = 0;
 
 		/*
 		 * iter_prev points to the non-removed node prior to the
 		 * insert location.
-		 * iter iterates until it finds the next non-removed
-		 * node.
 		 */
-		iter_prev = rcu_dereference(t->tbl[node->hash & (t->size - 1)]);
+		iter_prev = rcu_dereference(t->tbl[hash & (t->size - 1)]);
 		/* We can always skip the dummy node initially */
-		iter_prev_next = next = rcu_dereference(iter_prev->next);
-		assert(iter_prev);
+		iter = rcu_dereference(iter_prev->next);
 		assert(iter_prev->reverse_hash <= node->reverse_hash);
 		for (;;) {
-			iter = next;
-			if (unlikely(!clear_flag(iter)))
-				break;
+			if (unlikely(!iter))
+				goto insert;
+			if (clear_flag(iter)->reverse_hash > node->reverse_hash)
+				goto insert;
 			next = rcu_dereference(clear_flag(iter)->next);
-			if (unlikely(is_removed(next)))
-				continue;
+			if (is_removed(next))
+				goto gc_node;
 			if (unique
 			    && !clear_flag(iter)->dummy
 			    && !ht->compare_fct(node->key, node->key_len,
-					clear_flag(iter)->key,
-					clear_flag(iter)->key_len))
-				return -EEXIST;
-			if (clear_flag(iter)->reverse_hash > node->reverse_hash)
-				break;
+						clear_flag(iter)->key,
+						clear_flag(iter)->key_len))
+				return clear_flag(iter);
 			/* Only account for identical reverse hash once */
 			if (iter_prev->reverse_hash != clear_flag(iter)->reverse_hash)
 				check_resize(ht, t, ++chain_len);
 			iter_prev = clear_flag(iter);
-			iter_prev_next = next;
+			iter = next;
 		}
-		assert(node != iter);
+	insert:
+		assert(node != clear_flag(iter));
 		assert(!is_removed(iter_prev));
 		assert(iter_prev != node);
 		node->next = iter;
-		if (uatomic_cmpxchg(&iter_prev->next, iter_prev_next,
-				    node) != iter_prev_next)
-			continue;
+		if (uatomic_cmpxchg(&iter_prev->next, iter,
+				    node) != iter)
+			continue;	/* retry */
 		else
-			break;
+			goto gc_end;
+	gc_node:
+		assert(!is_removed(iter));
+		(void) uatomic_cmpxchg(&iter_prev->next, iter, clear_flag(next));
+		/* retry */
 	}
-	return 0;
+gc_end:
+	/* Garbage collect logically removed nodes in the bucket */
+	dummy = rcu_dereference(t->tbl[hash & (t->size - 1)]);
+	_ht_gc_bucket(dummy, node);
+	return node;
 }
 
 static
 int _ht_remove(struct rcu_ht *ht, struct rcu_table *t, struct rcu_ht_node *node)
 {
-	struct rcu_ht_node *iter_prev, *iter, *iter_prev_next, *next, *old;
-	unsigned long chain_len;
-	int found;
+	struct rcu_ht_node *dummy, *next, *old;
 	int flagged = 0;
+	unsigned long hash;
 
-retry:
-	chain_len = 0;
-	found = 0;
-	/*
-	 * iter_prev points to the non-removed node prior to the remove
-	 * location.
-	 * node is the node to remove.
-	 */
-	iter_prev = rcu_dereference(t->tbl[node->hash & (t->size - 1)]);
-	/* We can always skip the dummy node initially */
-	iter_prev_next = next = rcu_dereference(iter_prev->next);
-	assert(iter_prev);
-	assert(iter_prev->reverse_hash <= node->reverse_hash);
-	for (;;) {
-		iter = next;
-		if (unlikely(!clear_flag(iter)))
-			break;
-		next = rcu_dereference(clear_flag(iter)->next);
-		if (iter == node) {
-			found = 1;
-			break;
-		}
-		if (unlikely(is_removed(next)))
-			continue;
-		if (clear_flag(iter)->reverse_hash > node->reverse_hash)
-			break;
-		iter_prev = clear_flag(iter);
-		iter_prev_next = next;
-	} 
-	if (!found)
-		goto end;
-	if (!flagged) {
+	/* logically delete the node */
+	old = rcu_dereference(node->next);
+	do {
+		next = old;
 		if (is_removed(next))
 			goto end;
-		/* set deletion flag */
-		if ((old = uatomic_cmpxchg(&iter->next, next,
-					   flag_removed(next))) != next) {
-			if (old == flag_removed(next))
-				goto end;
-			else
-				goto retry;
-		}
-		flagged = 1;
-	}
+		assert(!node->dummy);
+		old = uatomic_cmpxchg(&node->next, next,
+				      flag_removed(next));
+	} while (old != next);
+
+	/* We performed the (logical) deletion. */
+	flagged = 1;
+
 	/*
-	 * Remove the element from the list.
-	 * - Retry if there has been a concurrent add before us.
-	 * - Retry if the prev node has been deleted (its next removed
-	 *   flag would be set).
-	 * - There cannot be a concurrent delete for our position, because
-	 *   we won the deletion flag cmpxchg.
-	 * - If there is a concurrent add or remove after us while our
-	 *   removed flag is set, it will skip us and link directly after
-	 *   the prior non-removed node before us. In this case, the
-	 *   retry will not find the node in the list anymore.
+	 * Ensure that the node is not visible to readers anymore: lookup for
+	 * the node, and remove it (along with any other logically removed node)
+	 * if found.
 	 */
-	if (uatomic_cmpxchg(&iter_prev->next, iter_prev_next,
-			    clear_flag(next)) != iter_prev_next)
-		goto retry;
+	hash = bit_reverse_ulong(node->reverse_hash);
+	dummy = rcu_dereference(t->tbl[hash & (t->size - 1)]);
+	_ht_gc_bucket(dummy, node);
 end:
 	/*
 	 * Only the flagging action indicated that we (and no other)
 	 * removed the node from the hash.
 	 */
-	if (flagged)
+	if (flagged) {
+		assert(is_removed(rcu_dereference(node->next)));
 		return 0;
-	else
+	} else
 		return -ENOENT;
 }
 
@@ -351,7 +352,6 @@ void init_table(struct rcu_ht *ht, struct rcu_table *t,
 			t->size = i;
 		t->tbl[i] = calloc(1, sizeof(struct rcu_ht_node));
 		t->tbl[i]->dummy = 1;
-		t->tbl[i]->hash = i;
 		t->tbl[i]->reverse_hash = bit_reverse_ulong(i);
 		(void) _ht_add(ht, t, t->tbl[i], 0);
 	}
@@ -402,33 +402,36 @@ struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key, size_t key_len)
 			node = NULL;
 			break;
 		}
-		if (!ht->compare_fct(node->key, node->key_len, key, key_len)) {
-			if (unlikely(is_removed(rcu_dereference(node->next))))
-				node = NULL;
-			break;
+		if (likely(!is_removed(rcu_dereference(node->next)))
+		    && !node->dummy
+		    && likely(!ht->compare_fct(node->key, node->key_len, key, key_len))) {
+				break;
 		}
 		node = clear_flag(rcu_dereference(node->next));
 	}
+	assert(!node || !node->dummy);
 	return node;
 }
 
 void ht_add(struct rcu_ht *ht, struct rcu_ht_node *node)
 {
 	struct rcu_table *t;
+	unsigned long hash;
 
-	node->hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
-	node->reverse_hash = bit_reverse_ulong((unsigned long) node->hash);
+	hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
+	node->reverse_hash = bit_reverse_ulong((unsigned long) hash);
 
 	t = rcu_dereference(ht->t);
 	(void) _ht_add(ht, t, node, 0);
 }
 
-int ht_add_unique(struct rcu_ht *ht, struct rcu_ht_node *node)
+struct rcu_ht_node *ht_add_unique(struct rcu_ht *ht, struct rcu_ht_node *node)
 {
 	struct rcu_table *t;
+	unsigned long hash;
 
-	node->hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
-	node->reverse_hash = bit_reverse_ulong((unsigned long) node->hash);
+	hash = ht->hash_fct(node->key, node->key_len, ht->hash_seed);
+	node->reverse_hash = bit_reverse_ulong((unsigned long) hash);
 
 	t = rcu_dereference(ht->t);
 	return _ht_add(ht, t, node, 1);
@@ -456,6 +459,7 @@ int ht_delete_dummy(struct rcu_ht *ht)
 		if (!node->dummy)
 			return -EPERM;
 		node = node->next;
+		assert(!is_removed(node));
 	} while (node);
 	/* Internal sanity check: all nodes left should be dummy */
 	for (i = 0; i < t->size; i++) {
@@ -481,6 +485,30 @@ int ht_destroy(struct rcu_ht *ht)
 	return ret;
 }
 
+void ht_count_nodes(struct rcu_ht *ht,
+		unsigned long *count,
+		unsigned long *removed)
+{
+	struct rcu_table *t;
+	struct rcu_ht_node *node, *next;
+
+	*count = 0;
+	*removed = 0;
+
+	t = rcu_dereference(ht->t);
+	/* Check that the table is empty */
+	node = rcu_dereference(t->tbl[0]);
+	do {
+		next = rcu_dereference(node->next);
+		if (is_removed(next)) {
+			assert(!node->dummy);
+			(*removed)++;
+		} else if (!node->dummy)
+			(*count)++;
+		node = clear_flag(next);
+	} while (node);
+}
+
 static
 void ht_free_table_cb(struct rcu_head *head)
 {