Merge branch 'master' into urcu/rcuja-range

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

diff --cc configure.ac
Simple merge

diff --cc tests/Makefile.am
index 1521ecb6fb02f85ded7a8dd2cc9b113df608ac0d,aa36bf447d2a0bd84fd42b59cb91f43f1afb7d88..f4c84d2b272782906bb86ec5c3f0c3c0d7abd012
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -21,9 -21,8 +21,9 @@@ noinst_PROGRAMS = test_urcu test_urcu_d
        test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash \
        test_urcu_lfs_rcu_dynlink \
        test_urcu_multiflavor test_urcu_multiflavor_dynlink \
 -      test_urcu_fork
 +      test_urcu_fork \
 +      test_urcu_ja test_urcu_ja_range
- noinst_HEADERS = rcutorture.h test_urcu_multiflavor.h cpuset.h
+ noinst_HEADERS = rcutorture.h test_urcu_multiflavor.h cpuset.h thread-id.h
  
  if COMPAT_ARCH
  COMPAT=$(top_srcdir)/compat_arch_@ARCHTYPE@.c

diff --cc urcu/hlist.h
index 15e672bc1702135ddfdb20b5676785dbd3cb2f55,9f4332ac87d9afd33e48e5de6dcd3c4a96d5da88..d2e2ec38e2304f24e8ad86c18389e7faf3154508
--- 1/urcu/hlist.h
--- 2/urcu/hlist.h
+++ b/urcu/hlist.h
@@@ -35,22 -33,20 +33,30 @@@ void CDS_INIT_HLIST_HEAD(struct cds_hli
        ptr->next = NULL;
  }
  
- /* Get typed element from list at a given position.  */
- #define cds_hlist_entry(ptr, type, member)                                    \
+ #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)))
  
- static inline int cds_hlist_empty(struct cds_hlist_head *head)
 +/* Get first entry from a list. Assumes the hlist is not empty. */
 +#define cds_hlist_first_entry(ptr, type, member) \
 +      cds_list_entry((ptr)->next, type, member)
 +
- /* Add new element at the head of the list.  */
- static inline void cds_hlist_add_head (struct cds_hlist_node *newp,
-                                  struct cds_hlist_head *head)
++static inline
++int cds_hlist_empty(struct cds_hlist_head *head)
 +{
 +      return !head->next;
 +}
 +
+ /* Add new element at the head of the list. */
+ static inline
+ void cds_hlist_add_head(struct cds_hlist_node *newp,
+               struct cds_hlist_head *head)
  {
        if (head->next)
                head->next->prev = newp;

diff --cc urcu/rcuhlist.h
index 1dcbdb4eecbc35207ba85c8c47af7a49d82f1f9f,69c4d3184fd50d7f38a730e17447678f5fec3991..b07c66b65ff1ccd33621f08e054594c375127bd7
--- 1/urcu/rcuhlist.h
--- 2/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.h
@@@ -47,43 -47,35 +47,49 @@@ void cds_hlist_del_rcu(struct cds_hlist
  {
        if (elem->next)
                elem->next->prev = elem->prev;
-       elem->prev->next = elem->next;
+       CMM_STORE_SHARED(elem->prev->next, elem->next);
  }
  
- #define cds_hlist_first_rcu(ptr, type)                                        \
 +/*
 + * 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_entry_rcu(ptr, type, member)                  \
++#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.
+  * 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))
+ #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.
+  * 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); \
+               pos != NULL; \
+               pos = rcu_dereference(pos->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);  \
-            pos != NULL;                                               \
-            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 */

diff --cc urcu/rculist.h
index e67503d9431d5da5d68d8f0a888613b1cebe2395,1fd2df388f57cefc0ea19fa02a0c8c0b627847e8..6759947dba2b78bcdb41b16222afd490922722f9
--- 1/urcu/rculist.h
--- 2/urcu/rculist.h
+++ b/urcu/rculist.h
@@@ -29,21 -29,34 +29,36 @@@
  #include <urcu/arch.h>
  #include <urcu-pointer.h>
  
- /* Add new element at the head of the list.
-  */
- static inline void cds_list_add_rcu(struct cds_list_head *newp, struct cds_list_head *head)
+ /* Add new element at the head of the list. */
+ static inline
+ void cds_list_add_rcu(struct cds_list_head *newp, struct cds_list_head *head)
  {
 -      newp->next = head->next;
 +      struct cds_list_head *first = head->next;
 +
 +      newp->next = first;
        newp->prev = head;
+       head->next->prev = newp;
        rcu_assign_pointer(head->next, newp);
-       first->prev = newp;
  }
  
- /* replace an old entry atomically.
+ /* Add new element at the tail of the list. */
+ static inline
+ void cds_list_add_tail_rcu(struct cds_list_head *newp,
+               struct cds_list_head *head)
+ {
+       newp->next = head;
+       newp->prev = head->prev;
+       rcu_assign_pointer(head->prev->next, newp);
+       head->prev = newp;
+ }
+ 
+ /*
+  * Replace an old entry atomically with respect to concurrent RCU
+  * traversal. Mutual exclusion against concurrent updates is required
+  * though.
   */
- static inline void cds_list_replace_rcu(struct cds_list_head *old, struct cds_list_head *_new)
+ static inline
+ void cds_list_replace_rcu(struct cds_list_head *old, struct cds_list_head *_new)
  {
        _new->next = old->next;
        _new->prev = old->prev;