X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=urcu%2Frcuhlist.h;h=1dcbdb4eecbc35207ba85c8c47af7a49d82f1f9f;hb=1b34283b72f272bffc9258306173b1cfe2e3ce8e;hp=83b13632536cb15a3a398505da960f4e3417c086;hpb=a00718e7e5df2c582de11fbd6be3d9420ad6c0e3;p=userspace-rcu.git

diff --git a/urcu/rcuhlist.h b/urcu/rcuhlist.h
index 83b1363..1dcbdb4 100644
--- a/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.h
@@ -50,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 elements of the list.
+/*
+ * 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.
  * 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 */