X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Flist.h;h=1d1c7b5ce2882b6bd0e13b53b096c081dbcb1b44;hb=ed1b099ef8acd1396dbde7c7150d1a5eb16ce8a6;hp=ab7a470a8d0f245541ce7b853b72875784ad511e;hpb=bc2433a9853a945a825c244e9ccfe341b73b2ceb;p=urcu.git

diff --git a/urcu/list.h b/urcu/list.h
index ab7a470..1d1c7b5 100644
--- a/urcu/list.h
+++ b/urcu/list.h
@@ -1,21 +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.
-
-   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 _CDS_LIST_H
 #define _CDS_LIST_H	1
@@ -121,23 +126,31 @@ cds_list_splice (struct cds_list_head *add, struct cds_list_head *head)
     }
 }
 
-
 /* Get typed element from list at a given position.  */
 #define cds_list_entry(ptr, type, member) \
   ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 
 
+/* Get first entry from a list. */
+#define cds_list_first_entry(ptr, type, member) \
+	cds_list_entry((ptr)->next, type, member)
+
 
 /* Iterate forward over the elements of the list.  */
 #define cds_list_for_each(pos, head) \
   for (pos = (head)->next; pos != (head); pos = pos->next)
 
+/* Iterate forward over the elements list. The list elements can be
+   removed from the list while doing this.  */
+#define cds_list_for_each_safe(pos, p, head) \
+  for (pos = (head)->next, p = pos->next; \
+       pos != (head); \
+       pos = p, p = pos->next)
 
-/* Iterate forward over the elements of the list.  */
+/* Iterate backward over the elements of the list.  */
 #define cds_list_for_each_prev(pos, head) \
   for (pos = (head)->prev; pos != (head); pos = pos->prev)
 
-
 /* Iterate backwards over the elements list.  The list elements can be
    removed from the list while doing this.  */
 #define cds_list_for_each_prev_safe(pos, p, head) \
@@ -146,20 +159,20 @@ cds_list_splice (struct cds_list_head *add, struct cds_list_head *head)
        pos = p, p = pos->prev)
 
 #define cds_list_for_each_entry(pos, head, member)				\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member);	\
+	for (pos = cds_list_entry((head)->next, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = cds_list_entry(pos->member.next, __typeof__(*pos), member))
 
 #define cds_list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member);	\
+	for (pos = cds_list_entry((head)->prev, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = cds_list_entry(pos->member.prev, __typeof__(*pos), member))
 
 #define cds_list_for_each_entry_safe(pos, p, head, member)			\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member),	\
-		     p = cds_list_entry(pos->member.next,typeof(*pos), member); \
+	for (pos = cds_list_entry((head)->next, __typeof__(*pos), member), \
+		     p = cds_list_entry(pos->member.next, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = p, p = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = p, p = cds_list_entry(pos->member.next, __typeof__(*pos), member))
 
 static inline int cds_list_empty(struct cds_list_head *head)
 {