From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Wed, 30 Sep 2009 14:15:36 +0000 (-0400)
Subject: urcu-ht: rename "stolen" to "flags"
X-Git-Tag: v0.7.0~43^2~239^2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3df2df75972d2ccaa1a1fa01bad06b0eda7f76f2;p=urcu.git

urcu-ht: rename "stolen" to "flags"

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---

diff --git a/urcu-ht.c b/urcu-ht.c
index 183fcb1..7213c39 100644
--- a/urcu-ht.c
+++ b/urcu-ht.c
@@ -17,13 +17,16 @@
 #include <urcu/jhash.h>
 #include <urcu-ht.h>
 
+/* node flags */
+#define	NODE_STOLEN	(1 << 0)
+
 struct rcu_ht_node;
 
 struct rcu_ht_node {
 	struct rcu_ht_node *next;
 	void *key;
 	void *data;
-	int stolen;
+	unsigned int flags;
 };
 
 struct rcu_ht {
@@ -95,7 +98,7 @@ int ht_add(struct rcu_ht *ht, void *key, void *data)
 	new_head = calloc(1, sizeof(struct rcu_ht_node));
 	new_head->key = key;
 	new_head->data = data;
-	new_head->stolen = 0;
+	new_head->flags = 0;
 	/* here comes the fun and tricky part.
 	 * Add at the beginning with a cmpxchg.
 	 * Hold a read lock between the moment the first element is read
@@ -177,9 +180,10 @@ retry:
 	if (!del_node) {
 		/*
 		 * Another concurrent thread stole it ? If so, let it deal with
-		 * this.
+		 * this. Assume NODE_STOLEN is the only flag. If this changes,
+		 * read flags before cmpxchg.
 		 */
-		if (cmpxchg(&node->stolen, 0, 1) != 0)
+		if (cmpxchg(&node->flags, 0, NODE_STOLEN) != 0)
 			goto error;
 	}