From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 1 Jul 2011 21:35:07 +0000 (-0400)
Subject: rculfqueue: Keep a reference to the current dummy node rather than using low bit
X-Git-Tag: v0.6.5~64
X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=909292c2c03dd468a7d0d4679e227a08170f51a7

rculfqueue: Keep a reference to the current dummy node rather than using low bit

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/urcu/rculfqueue.h b/urcu/rculfqueue.h
index 757d133..b9ed63b 100644
--- a/urcu/rculfqueue.h
+++ b/urcu/rculfqueue.h
@@ -37,8 +37,7 @@ struct cds_lfq_node_rcu {
 };
 
 struct cds_lfq_queue_rcu {
-	struct cds_lfq_node_rcu *head;
-	struct cds_lfq_node_rcu *tail;
+	struct cds_lfq_node_rcu *head, *tail, *dummy;
 	void (*queue_call_rcu)(struct rcu_head *head,
 		void (*func)(struct rcu_head *head));
 };
diff --git a/urcu/static/rculfqueue.h b/urcu/static/rculfqueue.h
index 33e71f5..0970c0f 100644
--- a/urcu/static/rculfqueue.h
+++ b/urcu/static/rculfqueue.h
@@ -60,9 +60,9 @@ struct cds_lfq_node_rcu_dummy {
  */
 
 static inline
-int is_dummy(struct cds_lfq_node_rcu *node)
+int is_dummy(struct cds_lfq_queue_rcu *q, struct cds_lfq_node_rcu *node)
 {
-	return ((unsigned long) node) & 0x1UL;
+	return node == q->dummy;
 }
 
 static inline
@@ -75,13 +75,7 @@ struct cds_lfq_node_rcu *make_dummy(struct cds_lfq_queue_rcu *q,
 	assert(dummy);
 	dummy->parent.next = next;
 	dummy->q = q;
-	return (struct cds_lfq_node_rcu *) (((unsigned long) &dummy->parent) | 0x1UL);
-}
-
-static inline
-struct cds_lfq_node_rcu *get_node(struct cds_lfq_node_rcu *node)
-{
-	return (struct cds_lfq_node_rcu *) (((unsigned long )node) & ~0x1UL);
+	return &dummy->parent;
 }
 
 static inline
@@ -97,8 +91,7 @@ void rcu_free_dummy(struct cds_lfq_node_rcu *node)
 {
 	struct cds_lfq_node_rcu_dummy *dummy;
 
-	dummy = caa_container_of(get_node(node), struct cds_lfq_node_rcu_dummy,
-				 parent);
+	dummy = caa_container_of(node, struct cds_lfq_node_rcu_dummy, parent);
 	dummy->q->queue_call_rcu(&dummy->head, free_dummy);
 }
 
@@ -114,6 +107,7 @@ void _cds_lfq_init_rcu(struct cds_lfq_queue_rcu *q,
 				void (*func)(struct rcu_head *head)))
 {
 	q->tail = make_dummy(q, NULL);
+	q->dummy = q->tail;
 	q->head = q->tail;
 	q->queue_call_rcu = queue_call_rcu;
 }
@@ -129,7 +123,7 @@ int _cds_lfq_destroy_rcu(struct cds_lfq_queue_rcu *q)
 	struct cds_lfq_node_rcu *head;
 
 	head = rcu_dereference(q->head);
-	if (!(is_dummy(head) && get_node(head)->next == NULL))
+	if (!(is_dummy(q, head) && head->next == NULL))
 		return -EPERM;	/* not empty */
 	rcu_free_dummy(head);
 	return 0;
@@ -151,7 +145,7 @@ void _cds_lfq_enqueue_rcu(struct cds_lfq_queue_rcu *q,
 		struct cds_lfq_node_rcu *tail, *next;
 
 		tail = rcu_dereference(q->tail);
-		next = uatomic_cmpxchg(&get_node(tail)->next, NULL, node);
+		next = uatomic_cmpxchg(&tail->next, NULL, node);
 		if (next == NULL) {
 			/*
 			 * Tail was at the end of queue, we successfully
@@ -185,8 +179,8 @@ struct cds_lfq_node_rcu *_cds_lfq_dequeue_rcu(struct cds_lfq_queue_rcu *q)
 		struct cds_lfq_node_rcu *head, *next;
 
 		head = rcu_dereference(q->head);
-		next = rcu_dereference(get_node(head)->next);
-		if (is_dummy(head) && next == NULL)
+		next = rcu_dereference(head->next);
+		if (is_dummy(q, head) && next == NULL)
 			return NULL;	/* empty */
 		/*
 		 * We never, ever allow dequeue to get to a state where
@@ -197,7 +191,7 @@ struct cds_lfq_node_rcu *_cds_lfq_dequeue_rcu(struct cds_lfq_queue_rcu *q)
 		 */
 		if (next) {
 			if (uatomic_cmpxchg(&q->head, head, next) == head) {
-				if (is_dummy(head)) {
+				if (is_dummy(q, head)) {
 					struct cds_lfq_node_rcu *node;
 					/*
 					 * Requeue dummy. We need to
@@ -206,6 +200,12 @@ struct cds_lfq_node_rcu *_cds_lfq_dequeue_rcu(struct cds_lfq_queue_rcu *q)
 					 */
 					rcu_free_dummy(head);
 					node = make_dummy(q, NULL);
+					/*
+					 * We are the only thread
+					 * allowed to update dummy (we
+					 * own the old dummy).
+					 */
+					q->dummy = node;
 					_cds_lfq_enqueue_rcu(q, node);
 					continue;	/* try again */
 				}