X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Frcuhlist.h;h=1dcbdb4eecbc35207ba85c8c47af7a49d82f1f9f;hb=ade342cbaeff2436d44eb17899765cb64a1271ca;hp=ef024abe7034f70d5db05312d620a329fb03ab08;hpb=16aa9ee87cf4364921c36025359be01390338d87;p=userspace-rcu.git

diff --git a/urcu/rcuhlist.h b/urcu/rcuhlist.h
index ef024ab..1dcbdb4 100644
--- a/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.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
-
-   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_RCUHLIST_H
 #define _URCU_RCUHLIST_H
@@ -49,16 +50,40 @@ static inline void cds_hlist_del_rcu(struct cds_hlist_node *elem)
 	elem->prev->next = elem->next;
 }
 
+/*
+ * Get first element from a RCU hlist. Assumes the hlist is not empty.
+ * This must be done while rcu_read_lock() is held.
+ */
+#define cds_hlist_first_rcu(ptr, type)					\
+	rcu_dereference((ptr)->next)
+
+/*
+ * Get first entry from a RCU hlist. Assumes the hlist is not empty.
+ * This must be done while rcu_read_lock() is held.
+ */
+#define cds_hlist_first_entry_rcu(ptr, type, member)			\
+	cds_hlist_entry(rcu_dereference((ptr)->next), type, member)
+
+/*
+ * Iterate through nodes of the list.
+ * This must be done while rcu_read_lock() is held.
+ */
+
+#define cds_hlist_for_each_rcu(pos, head)				\
+	for (pos = rcu_dereference((head)->next);			\
+	     pos != NULL;						\
+	     pos = rcu_dereference((pos)->next))
 
-/* Iterate through elements of the list.
+/*
+ * Iterate through elements of the list.
  * This must be done while rcu_read_lock() is held.
  */
 
 #define cds_hlist_for_each_entry_rcu(entry, pos, head, member)		\
 	for (pos = rcu_dereference((head)->next),			\
-		     entry = cds_hlist_entry(pos, typeof(*entry), member);	\
+		     entry = cds_hlist_entry(pos, __typeof__(*entry), member);	\
 	     pos != NULL;						\
 	     pos = rcu_dereference(pos->next),				\
-		     entry = cds_hlist_entry(pos, typeof(*entry), member))
+		     entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
 #endif	/* _URCU_RCUHLIST_H */