X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=urcu%2Frcuja.h;h=f8cba6af4da08fb5ba0aa7a0a1d46d8c3f16e377;hb=7f14b43af6d0ae0f3201c2cb8cfae80eb74f0d17;hp=9a006a395bcc31a3748acd42e134036a5a5e4254;hpb=d553beef47f7dfb7e60af14a93e34f60940207ea;p=userspace-rcu.git

diff --git a/urcu/rcuja.h b/urcu/rcuja.h
index 9a006a3..f8cba6a 100644
--- a/urcu/rcuja.h
+++ b/urcu/rcuja.h
@@ -36,11 +36,12 @@
 extern "C" {
 #endif
 
+/*
+ * Duplicate nodes with the same key are chained into a singly-linked
+ * list. The last item of this list has a NULL next pointer.
+ */
 struct cds_ja_node {
-	/* Linked list of nodes with same key */
-	struct cds_hlist_node list;
-	/* delayed reclaim */
-	struct rcu_head head;
+	struct cds_ja_node *next;
 };
 
 struct cds_ja;
@@ -57,11 +58,16 @@ void cds_ja_node_init(struct cds_ja_node *node)
 {
 }
 
-struct cds_hlist_head cds_ja_lookup(struct cds_ja *ja, uint64_t key);
+struct cds_ja_node *cds_ja_lookup(struct cds_ja *ja, uint64_t key);
+struct cds_ja_node *cds_ja_lookup_lower_equal(struct cds_ja *ja,
+		uint64_t key);
 
 int cds_ja_add(struct cds_ja *ja, uint64_t key,
 		struct cds_ja_node *new_node);
 
+struct cds_ja_node *cds_ja_add_unique(struct cds_ja *ja, uint64_t key,
+		struct cds_ja_node *new_node);
+
 int cds_ja_del(struct cds_ja *ja, uint64_t key,
 		struct cds_ja_node *node);
 
@@ -75,7 +81,16 @@ struct cds_ja *cds_ja_new(unsigned int key_bits)
 }
 
 int cds_ja_destroy(struct cds_ja *ja,
-		void (*free_node_cb)(struct rcu_head *head));
+		void (*rcu_free_node_cb)(struct cds_ja_node *node));
+
+/*
+ * Iterate through duplicates returned by cds_ja_lookup*()
+ * This must be done while rcu_read_lock() is held.
+ * Receives a struct cds_ja_node * as parameter, which is used as start
+ * of duplicate list and loop cursor.
+ */
+#define cds_ja_for_each_duplicate_rcu(pos)				\
+	for (; (pos) != NULL; (pos) = rcu_dereference((pos)->next))
 
 #ifdef __cplusplus
 }