Merge branch 'master' into urcu/ht

[urcu.git] / urcu / rculfstack.h

diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h
index a9e624ce792ee2b59ecb648084df5cda73a60e46..75a580b58fe39e55af2b899ef38010fe66b3db0e 100644 (file)
--- a/urcu/rculfstack.h
+++ b/urcu/rculfstack.h
@@ -23,80 +23,46 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if (!defined(_GNU_SOURCE) && !defined(_LGPL_SOURCE))
-#error "Dynamic loader LGPL wrappers not implemented yet"
+#ifdef __cplusplus
+extern "C" {
 #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
 
-void rcu_lfs_init(struct rcu_lfs_stack *s)
-{
-       s->head = NULL;
-}
+#include <urcu/static/rculfstack.h>
 
-void rcu_lfs_push(struct rcu_lfs_stack *s, struct rcu_lfs_node *node)
-{
-       for (;;) {
-               struct rcu_lfs_node *head;
+#define cds_lfs_node_init_rcu  _cds_lfs_node_init_rcu
+#define cds_lfs_init_rcu       _cds_lfs_init_rcu
+#define cds_lfs_push_rcu       _cds_lfs_push_rcu
+#define cds_lfs_pop_rcu                _cds_lfs_pop_rcu
 
-               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;
-               }
-       }
-}
+#else /* !_LGPL_SOURCE */
+
+extern void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node);
+extern void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s);
+extern void 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;
+extern struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s);
 
-               rcu_read_lock();
-               head = rcu_dereference(s->head);
-               if (head) {
-                       struct rcu_lfs_node *next = rcu_dereference(head->next);
+#endif /* !_LGPL_SOURCE */
 
-                       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;
-               }
-       }
+#ifdef __cplusplus
 }
+#endif
 
 #endif /* _URCU_RCULFSTACK_H */