X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfstack-static.h;h=7caf3c8c0d15f344170c33873f4cb6f4b4d107fa;hp=8eae35d1bc0d2c9fc12955d6c5185f3bcb1ecfbb;hb=acfd099eae9026369f558e73b2a7e35860962d9d;hpb=b6a37eaca5f072e7bba90a2562b7f2ac238fe23b

diff --git a/urcu/rculfstack-static.h b/urcu/rculfstack-static.h
index 8eae35d..7caf3c8 100644
--- a/urcu/rculfstack-static.h
+++ b/urcu/rculfstack-static.h
@@ -33,65 +33,58 @@
 extern "C" {
 #endif
 
-void _rcu_lfs_node_init(struct rcu_lfs_node *node)
+void _cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node)
 {
 }
 
-void _rcu_lfs_init(struct rcu_lfs_stack *s)
+void _cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s)
 {
 	s->head = NULL;
 }
 
-void _rcu_lfs_push(struct rcu_lfs_stack *s, struct rcu_lfs_node *node)
+void _cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rcu *node)
 {
+	struct cds_lfs_node_rcu *head = NULL;
+
 	for (;;) {
-		struct rcu_lfs_node *head;
+		struct cds_lfs_node_rcu *old_head = head;
 
-		rcu_read_lock();
-		head = rcu_dereference(s->head);
 		node->next = head;
 		/*
 		 * uatomic_cmpxchg() implicit memory barrier orders earlier
 		 * stores to node before publication.
 		 */
-		if (uatomic_cmpxchg(&s->head, head, node) == head) {
-			rcu_read_unlock();
-			return;
-		} else {
-			/* Failure to prepend. Retry. */
-			rcu_read_unlock();
-			continue;
-		}
+		head = uatomic_cmpxchg(&s->head, old_head, node);
+		if (old_head == head)
+			break;
 	}
 }
 
 /*
+ * Should be called under rcu read-side lock.
+ *
  * The caller must wait for a grace period to pass before freeing the returned
- * node or modifying the rcu_lfs_node structure.
+ * node or modifying the cds_lfs_node_rcu structure.
  * Returns NULL if stack is empty.
  */
-struct rcu_lfs_node *
-_rcu_lfs_pop(struct rcu_lfs_stack *s)
+struct cds_lfs_node_rcu *
+_cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s)
 {
 	for (;;) {
-		struct rcu_lfs_node *head;
+		struct cds_lfs_node_rcu *head;
 
-		rcu_read_lock();
 		head = rcu_dereference(s->head);
 		if (head) {
-			struct rcu_lfs_node *next = rcu_dereference(head->next);
+			struct cds_lfs_node_rcu *next = rcu_dereference(head->next);
 
 			if (uatomic_cmpxchg(&s->head, head, next) == head) {
-				rcu_read_unlock();
 				return head;
 			} else {
 				/* Concurrent modification. Retry. */
-				rcu_read_unlock();
 				continue;
 			}
 		} else {
 			/* Empty stack */
-			rcu_read_unlock();
 			return NULL;
 		}
 	}