AM_CONDITIONAL([COMPAT_FUTEX], [test "x$compat_futex_test" = "x1"])
AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = "xx86compat"])
+ AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
# smp-support configure option
AC_ARG_ENABLE([smp-support],
doc/Makefile
doc/examples/Makefile
tests/Makefile
+ rcuja/Makefile
liburcu.pc
liburcu-bp.pc
liburcu-cds.pc
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
URCU_BP_LIB=$(top_builddir)/liburcu-bp.la
URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
-EXTRA_DIST = $(top_srcdir)/tests/api.h runall.sh runhash.sh
+EXTRA_DIST = $(top_srcdir)/tests/api.h runall.sh runhash.sh runja.sh
test_urcu_SOURCES = test_urcu.c $(URCU)
test_urcu_multiflavor_dynlink_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
$(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB)
+test_urcu_ja_SOURCES = test_urcu_ja.c test_urcu_ja.h \
+ $(COMPAT)
+test_urcu_ja_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
+test_urcu_ja_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB)
+
+test_urcu_ja_range_SOURCES = test_urcu_ja_range.c test_urcu_ja_range.h \
+ $(COMPAT)
+test_urcu_ja_range_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
+test_urcu_ja_range_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB)
+
urcutorture.c: api.h
check-am:
*
* Author: Jan Blunck <jblunck@suse.de>
*
- * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License version 2.1 as
#include <stddef.h>
- struct cds_hlist_head
- {
+ struct cds_hlist_head {
struct cds_hlist_node *next;
};
- struct cds_hlist_node
- {
- struct cds_hlist_node *next;
- struct cds_hlist_node *prev;
+ struct cds_hlist_node {
+ struct cds_hlist_node *next, *prev;
};
- /* Initialize a new list head. */
- static inline void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
+ /* Initialize a new list head. */
+ static inline
+ void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
{
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;
-
newp->next = head->next;
- newp->prev = (struct cds_hlist_node *)head;
+ newp->prev = (struct cds_hlist_node *) head;
head->next = newp;
}
- /* Remove element from list. */
- static inline void cds_hlist_del (struct cds_hlist_node *elem)
+ /* Remove element from list. */
+ static inline
+ void cds_hlist_del(struct cds_hlist_node *elem)
{
if (elem->next)
elem->next->prev = elem->prev;
-
elem->prev->next = elem->next;
}
- #define cds_hlist_for_each_entry(entry, pos, head, member) \
- for (pos = (head)->next, \
- entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
- pos != NULL; \
- pos = pos->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 = p, \
- entry = cds_hlist_entry(pos, __typeof__(*entry), member))
+ #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); \
+ pos != NULL; \
+ pos = pos->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 = 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 */
#include <urcu/arch.h>
#include <urcu-pointer.h>
- /* Add new element at the head of the list.
- */
- static inline void cds_hlist_add_head_rcu(struct cds_hlist_node *newp,
- struct cds_hlist_head *head)
+ /* Add new element at the head of the list. */
+ static inline
+ void cds_hlist_add_head_rcu(struct cds_hlist_node *newp,
+ struct cds_hlist_head *head)
{
newp->next = head->next;
newp->prev = (struct cds_hlist_node *)head;
- cmm_smp_wmb();
if (head->next)
head->next->prev = newp;
- head->next = newp;
+ rcu_assign_pointer(head->next, newp);
}
/* Remove element from list. */
- static inline void cds_hlist_del_rcu(struct cds_hlist_node *elem)
+ static inline
+ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
{
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 */
#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;
}
/* Remove element from list. */
- static inline void cds_list_del_rcu(struct cds_list_head *elem)
+ static inline
+ void cds_list_del_rcu(struct cds_list_head *elem)
{
elem->next->prev = elem->prev;
CMM_STORE_SHARED(elem->prev->next, elem->next);
/* Iterate forward over the elements of the list. */
#define cds_list_for_each_rcu(pos, head) \
- for (pos = rcu_dereference((head)->next); pos != (head); \
- pos = rcu_dereference(pos->next))
+ for (pos = rcu_dereference((head)->next); pos != (head); \
+ pos = rcu_dereference(pos->next))
- /* Iterate through elements of the list.
- */
- #define cds_list_for_each_entry_rcu(pos, head, member) \
- for (pos = cds_list_entry(rcu_dereference((head)->next), __typeof__(*pos), member); \
- &pos->member != (head); \
- pos = cds_list_entry(rcu_dereference(pos->member.next), __typeof__(*pos), member))
+ /* Iterate through elements of the list. */
+ #define cds_list_for_each_entry_rcu(pos, head, member) \
+ for (pos = cds_list_entry(rcu_dereference((head)->next), __typeof__(*pos), member); \
+ &pos->member != (head); \
+ pos = cds_list_entry(rcu_dereference(pos->member.next), __typeof__(*pos), member))
#endif /* _URCU_RCULIST_H */
projects / userspace-rcu.git / commitdiff
