Merge remote branch 'origin/urcu/ht' into urcu/ht

[urcu.git] / urcu / rculist.h

diff --git a/urcu/rculist.h b/urcu/rculist.h
index 96f0a3021d86b4b38bb2affb117dbd9b29524cb9..621831ce0aec6d3bd8117faa1aeed3b76bb64e16 100644 (file)
--- a/urcu/rculist.h
+++ b/urcu/rculist.h
@@ -4,6 +4,7 @@
 
    Copyright (C) 2009 Pierre-Marc Fournier
    Conversion to RCU list.
+   Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -24,35 +25,53 @@
 #define _URCU_RCULIST_H
 
 #include <urcu/list.h>
-#include <urcu.h>
+#include <urcu/arch.h>
+#include <urcu-pointer.h>
 
 /* Add new element at the head of the list.
  */
-static inline void list_add_rcu(list_t *newp, list_t *head)
+static inline void cds_list_add_rcu(struct cds_list_head *newp, struct cds_list_head *head)
 {
        newp->next = head->next;
        newp->prev = head;
-       smp_wmb();
+       cmm_smp_wmb();
        head->next->prev = newp;
        head->next = newp;
 }
 
+/* replace an old entry atomically.
+ */
+static inline void cds_list_replace_rcu(struct cds_list_head *old, struct cds_list_head *_new)
+{
+       _new->next = old->next;
+       _new->prev = old->prev;
+       rcu_assign_pointer(_new->prev->next, _new);
+       _new->next->prev = _new;
+}
 
 /* Remove element from list. */
-static inline void list_del_rcu(list_t *elem)
+static inline void cds_list_del_rcu(struct cds_list_head *elem)
 {
        elem->next->prev = elem->prev;
        elem->prev->next = elem->next;
 }
 
+/*
+ * Iteration through all elements of the list must be done while rcu_read_lock()
+ * is held.
+ */
+
+/* Iterate forward over the elements of the list.  */
+#define cds_list_for_each_rcu(pos, head) \
+  for (pos = rcu_dereference((head)->next); pos != (head); \
+       pos = rcu_dereference(pos->next))
+
 
 /* Iterate through elements of the list.
- * This must be done while rcu_read_lock() is held.
  */
-
-#define list_for_each_entry_rcu(pos, head, member)                             \
-       for (pos = list_entry(rcu_dereference((head)->next), typeof(*pos), member);     \
+#define cds_list_for_each_entry_rcu(pos, head, member)                         \
+       for (pos = cds_list_entry(rcu_dereference((head)->next), typeof(*pos), member); \
             &pos->member != (head);                                    \
-            pos = list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
+            pos = cds_list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
 
 #endif /* _URCU_RCULIST_H */