X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfstack.h;h=c7e5599d07fa12f13573c6dd877432be08a120e9;hp=f80c7fea012a6e6240bf2ee04ee54f557966a4ff;hb=b0a841b4ff807dd29fe0cdbfe24900312f0e627b;hpb=0e2e9380d93d73c246abdeef52c7a97b01deecca

diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h
index f80c7fe..c7e5599 100644
--- a/urcu/rculfstack.h
+++ b/urcu/rculfstack.h
@@ -23,85 +23,75 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <urcu/compiler.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if (!defined(_GNU_SOURCE) && !defined(_LGPL_SOURCE))
-#error "Dynamic loader LGPL wrappers not implemented yet"
+#ifndef CDS_LFS_RCU_DEPRECATED
+#define CDS_LFS_RCU_DEPRECATED	\
+	CDS_DEPRECATED("urcu/rculfstack.h is deprecated. Please use urcu/lfstack.h instead.")
 #endif
 
-struct rcu_lfs_node {
-	struct rcu_lfs_node *next;
+struct cds_lfs_node_rcu {
+	struct cds_lfs_node_rcu *next;
 };
 
-struct rcu_lfs_stack {
-	struct rcu_lfs_node *head;
+struct cds_lfs_stack_rcu {
+	struct cds_lfs_node_rcu *head;
 };
 
-void rcu_lfs_node_init(struct rcu_lfs_node *node)
+#ifdef _LGPL_SOURCE
+
+#include <urcu/static/rculfstack.h>
+
+static inline CDS_LFS_RCU_DEPRECATED
+void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node)
+{
+	_cds_lfs_node_init_rcu(node);
+}
+
+static inline
+void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s)
 {
+	_cds_lfs_init_rcu(s);
 }
 
-void rcu_lfs_init(struct rcu_lfs_stack *s)
+static inline CDS_LFS_RCU_DEPRECATED
+int cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s,
+			struct cds_lfs_node_rcu *node)
 {
-	s->head = NULL;
+	return _cds_lfs_push_rcu(s, node);
 }
 
-void rcu_lfs_push(struct rcu_lfs_stack *s, struct rcu_lfs_node *node)
+static inline CDS_LFS_RCU_DEPRECATED
+struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s)
 {
-	for (;;) {
-		struct rcu_lfs_node *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;
-		}
-	}
+	return _cds_lfs_pop_rcu(s);
 }
 
+#else /* !_LGPL_SOURCE */
+
+extern CDS_LFS_RCU_DEPRECATED
+void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node);
+extern CDS_LFS_RCU_DEPRECATED
+void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s);
+extern CDS_LFS_RCU_DEPRECATED
+int cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s,
+			struct cds_lfs_node_rcu *node);
+
 /*
+ * Should be called under rcu read lock critical section.
+ *
  * The caller must wait for a grace period to pass before freeing the returned
- * node.
+ * 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)
-{
-	for (;;) {
-		struct rcu_lfs_node *head;
-
-		rcu_read_lock();
-		head = rcu_dereference(s->head);
-		if (head) {
-			struct rcu_lfs_node *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;
-		}
-	}
-}
+extern CDS_LFS_RCU_DEPRECATED
+struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s);
+
+#endif /* !_LGPL_SOURCE */
 
 #ifdef __cplusplus
 }