hlist/rcuhlist update

introduce:

- cds_hlist_for_each()
- cds_hlist_for_each_safe()
- CDS_HLIST_HEAD()
- CDS_HLIST_HEAD_INIT()
- cds_hlist_for_each_entry_2() (takes 3 argument, like the Linux kernel
  API),
- cds_hlist_for_each_entry_safe_2() (takes 4 arguments, like the Linux
  kernel API),
- cds_hlist_for_each_rcu()
- cds_hlist_for_each_entry_rcu_2() (takes 3 arguments, like the Linux
  kernel API).

Left cds_hlist_for_each_entry(), cds_hlist_for_each_entry_safe() and
cds_hlist_for_each_entry_rcu() as-is (different from the ones found in
the Linux kernel) because those APIs were already exposed by Userspace
RCU.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu/hlist.h b/urcu/hlist.h
index 1c9083bf955046b726c494024b7713da6e5be8bb..9f4332ac87d9afd33e48e5de6dcd3c4a96d5da88 100644 (file)
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -33,6 +33,12 @@ void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
        ptr->next = NULL;
 }
 
        ptr->next = NULL;
 }
 

+#define CDS_HLIST_HEAD(name) \
+       struct cds_hlist_head name = { NULL }
+
+#define CDS_HLIST_HEAD_INIT(name) \
+       { .next = NULL }
+

 /* Get typed element from list at a given position. */
 #define cds_hlist_entry(ptr, type, member) \
        ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 /* Get typed element from list at a given position. */
 #define cds_hlist_entry(ptr, type, member) \
        ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))


@@ -58,6 +64,20 @@ void cds_hlist_del(struct cds_hlist_node *elem)
        elem->prev->next = elem->next;
 }
 
        elem->prev->next = elem->next;
 }
 

+#define cds_hlist_for_each(pos, head) \
+       for (pos = (head)->next; pos != NULL; pos = pos->next)
+
+#define cds_hlist_for_each_safe(pos, p, head) \
+       for (pos = (head)->next; \
+               (pos != NULL) && (p = pos->next, 1); \
+               pos = p)
+
+/*
+ * cds_hlist_for_each_entry and cds_hlist_for_each_entry_safe take
+ * respectively 4 and 5 arguments, while the Linux kernel APIs take 3,
+ * and 4. We implement cds_hlist_for_each_entry_2() and
+ * cds_hlist_for_each_entry_safe_2() to follow the Linux kernel APIs.
+ */

 #define cds_hlist_for_each_entry(entry, pos, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
 #define cds_hlist_for_each_entry(entry, pos, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \


@@ -68,8 +88,19 @@ void cds_hlist_del(struct cds_hlist_node *elem)
 #define cds_hlist_for_each_entry_safe(entry, pos, p, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
 #define cds_hlist_for_each_entry_safe(entry, pos, p, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \

-               (pos != NULL) && ({ p = pos->next; 1;}); \
+               (pos != NULL) && (p = pos->next, 1); \

                pos = p, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
                pos = p, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 

+#define cds_hlist_for_each_entry_2(entry, head, member) \
+       for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
+               &entry->member != NULL; \
+               entry = cds_hlist_entry(entry->member.next, __typeof__(*entry), member))
+
+#define cds_hlist_for_each_entry_safe_2(entry, e, head, member) \
+       for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
+               (&entry->member != NULL) && (e = cds_hlist_entry(entry->member.next, \
+                                               __typeof__(*entry), member), 1); \
+               entry = e)
+

 #endif /* _KCOMPAT_HLIST_H */
 #endif /* _KCOMPAT_HLIST_H */

diff --git a/urcu/rcuhlist.h b/urcu/rcuhlist.h
index 6d88692e854faf51a4105a8c7d46baa5c624e6c6..69c4d3184fd50d7f38a730e17447678f5fec3991 100644 (file)
--- a/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.h
@@ -54,6 +54,16 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
  * Iterate through elements of the list.
  * This must be done while rcu_read_lock() is held.
  */
  * Iterate through elements 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))
+
+/*
+ * cds_hlist_for_each_entry_rcu takes 4 arguments, while the Linux
+ * kernel API only takes 3.
+ * We implement cds_hlist_for_each_entry_rcu_2() to follow the Linux
+ * kernel APIs.
+ */

 #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); \
 #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); \


@@ -61,4 +71,11 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
                pos = rcu_dereference(pos->next), \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
                pos = rcu_dereference(pos->next), \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 

+#define cds_hlist_for_each_entry_rcu_2(entry, head, member) \
+       for (entry = cds_hlist_entry(rcu_dereference((head)->next), \
+                       __typeof__(*entry), member); \
+               &entry->member != NULL; \
+               entry = cds_hlist_entry(rcu_dereference(entry->member.next), \
+                       __typeof__(*entry), member))
+

 #endif /* _URCU_RCUHLIST_H */
 #endif /* _URCU_RCUHLIST_H */