X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Frculist.h;h=e67503d9431d5da5d68d8f0a888613b1cebe2395;hb=4b677847e8454cc75399bef6d380eb9df38ee3f9;hp=621831ce0aec6d3bd8117faa1aeed3b76bb64e16;hpb=bc2433a9853a945a825c244e9ccfe341b73b2ceb;p=userspace-rcu.git

diff --git a/urcu/rculist.h b/urcu/rculist.h
index 621831c..e67503d 100644
--- a/urcu/rculist.h
+++ b/urcu/rculist.h
@@ -1,25 +1,26 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-   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
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+/*
+ * Copyright (C) 2002 Free Software Foundation, Inc.
+ * (originally part of the GNU C Library)
+ * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ *
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Conversion to RCU list.
+ * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 #ifndef _URCU_RCULIST_H
 #define _URCU_RCULIST_H
@@ -32,11 +33,12 @@
  */
 static inline void cds_list_add_rcu(struct cds_list_head *newp, struct cds_list_head *head)
 {
-	newp->next = head->next;
+	struct cds_list_head *first = head->next;
+
+	newp->next = first;
 	newp->prev = head;
-	cmm_smp_wmb();
-	head->next->prev = newp;
-	head->next = newp;
+	rcu_assign_pointer(head->next, newp);
+	first->prev = newp;
 }
 
 /* replace an old entry atomically.
@@ -53,7 +55,7 @@ static inline void cds_list_replace_rcu(struct cds_list_head *old, struct cds_li
 static inline void cds_list_del_rcu(struct cds_list_head *elem)
 {
 	elem->next->prev = elem->prev;
-	elem->prev->next = elem->next;
+	CMM_STORE_SHARED(elem->prev->next, elem->next);
 }
 
 /*
@@ -70,8 +72,8 @@ static inline void cds_list_del_rcu(struct cds_list_head *elem)
 /* Iterate through elements of the list.
  */
 #define cds_list_for_each_entry_rcu(pos, head, member)				\
-	for (pos = cds_list_entry(rcu_dereference((head)->next), typeof(*pos), member);	\
+	for (pos = cds_list_entry(rcu_dereference((head)->next), __typeof__(*pos), member);	\
 	     &pos->member != (head);					\
-	     pos = cds_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 */