X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=urcu%2Frculfhash.h;h=06e3eb9cc64d4bc659adb70086662524a3fe8614;hb=0b0627bf31ff2393658a0285e342887df6688b18;hp=6e4f6040094f81eba2736718263eaf66f88ea97e;hpb=a6b3a718379cfd3c61fd9fcde32efcfda55dfc91;p=urcu.git

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 6e4f604..06e3eb9 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -26,6 +26,7 @@
  */
 
 #include <stdint.h>
+#include <urcu/compiler.h>
 #include <urcu-call-rcu.h>
 
 #ifdef __cplusplus
@@ -361,6 +362,43 @@ int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_iter *iter);
  */
 void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
 
+/*
+ * Note: cds_lfht_for_each are safe for element removal during
+ * iteration.
+ */
+#define cds_lfht_for_each(ht, iter, node)				\
+	for (cds_lfht_first(ht, iter),					\
+			node = cds_lfht_iter_get_node(iter);		\
+		node != NULL;						\
+		cds_lfht_next(ht, iter),				\
+			node = cds_lfht_iter_get_node(iter))
+
+#define cds_lfht_for_each_duplicate(ht, match, hash, key, iter, node)	\
+	for (cds_lfht_lookup(ht, match, hash, key, iter),		\
+			node = cds_lfht_iter_get_node(iter);		\
+		node != NULL;						\
+		cds_lfht_next_duplicate(ht, match, key, iter),		\
+			node = cds_lfht_iter_get_node(iter))
+
+#define cds_lfht_for_each_entry(ht, iter, pos, member)			\
+	for (cds_lfht_first(ht, iter),					\
+			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
+					typeof(*(pos)), member);	\
+		&(pos)->member != NULL;					\
+		cds_lfht_next(ht, iter),				\
+			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
+					typeof(*(pos)), member))
+
+#define cds_lfht_for_each_entry_duplicate(ht, match, hash, key,		\
+				iter, pos, member)			\
+	for (cds_lfht_lookup(ht, match, hash, key, iter),		\
+			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
+					typeof(*(pos)), member);	\
+		&(pos)->member != NULL;					\
+		cds_lfht_next_duplicate(ht, match, key, iter),		\
+			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
+					typeof(*(pos)), member))
+
 #ifdef __cplusplus
 }
 #endif