Merge branch 'master' into rbtree2

Conflicts:
	Makefile.am
	tests/Makefile.am

diff --cc Makefile.am
index 619a0b9a5bc1b80af51706bfd2e983bd025cd3df,7f30a20538c2f0a7bc3ab7d33cc49b5619555c5b..c73dc40a3c8dfe4fb6a07ed6e8ef135ae3bb31e5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -5,19 -7,21 +7,22 @@@ AM_CFLAGS=-Wal
  
  SUBDIRS = . tests
  
- include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h
+ include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
+               urcu-pointer.h urcu-qsbr.h
  nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
-               urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h \
-               urcu/uatomic_generic.h urcu/arch_generic.h urcu/wfstack.h \
+               urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/futex.h \
+               urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \
                urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \
-               urcu/wfqueue-static.h urcu/wfstack-static.h \
-               urcu/rculfqueue-static.h urcu/rculfstack-static.h \
-               urcu/urcu_ref.h urcu/rcurbtree.h
- nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h
+               urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \
 -              urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h
++              urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h \
++              urcu/rcurbtree.h
+ nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
  
- EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \
+ EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
                gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \
-               README LICENSE compat_arch_x86.c
+               README LICENSE compat_arch_x86.c \
+               urcu-call-rcu-impl.h urcu-defer-impl.h \
+               ChangeLog
  
  if COMPAT_ARCH
  COMPAT=compat_arch_@ARCHTYPE@.c
@@@ -29,17 -33,22 +34,23 @@@ if COMPAT_FUTE
  COMPAT+=compat_futex.c
  endif
  
- lib_LTLIBRARIES = liburcu.la liburcu-qsbr.la liburcu-mb.la liburcu-signal.la \
-                 liburcu-bp.la liburcu-rbtree.la \
-                 libwfqueue.la libwfstack.la librculfqueue.la librculfstack.la
+ lib_LTLIBRARIES = liburcu-cds-common.la \
+               liburcu.la liburcu-qsbr.la \
+               liburcu-mb.la liburcu-signal.la liburcu-bp.la \
+               liburcu-cds.la liburcu-cds-qsbr.la \
 -              liburcu-cds-mb.la liburcu-cds-signal.la liburcu-cds-bp.la
++              liburcu-cds-mb.la liburcu-cds-signal.la liburcu-cds-bp.la \
++              liburcu-rbtree.la
+ 
+ liburcu_cds_common_la_SOURCES = wfqueue.c wfstack.c $(COMPAT)
  
  liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
- liburcu_la_LIBADD = -lwfqueue
- liburcu_la_DEPENDENCIES = libwfqueue.la
+ liburcu_la_LIBADD = liburcu-cds-common.la
+ liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  
  liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
- liburcu_qsbr_la_LIBADD = -lwfqueue
- liburcu_qsbr_la_DEPENDENCIES = libwfqueue.la
+ liburcu_qsbr_la_LIBADD = liburcu-cds-common.la
+ liburcu_cds_qsbr_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
+ liburcu_cds_qsbr_la_CFLAGS = -DRCU_QSBR
  
  liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_mb_la_CFLAGS = -DRCU_MB
@@@ -48,18 -58,15 +60,17 @@@ liburcu_cds_mb_la_CFLAGS = -DRCU_M
  
  liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
- liburcu_signal_la_LIBADD = -lwfqueue
- liburcu_signal_la_DEPENDENCIES = libwfqueue.la
+ liburcu_signal_la_LIBADD = liburcu-cds-common.la
+ liburcu_cds_signal_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
+ liburcu_cds_signal_la_CFLAGS = -DRCU_SIGNAL
  
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
- liburcu_bp_la_CFLAGS = -lwfqueue
- liburcu_bp_la_DEPENDENCIES = libwfqueue.la
+ liburcu_bp_la_LIBADD = liburcu-cds-common.la
+ liburcu_cds_bp_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
+ liburcu_cds_bp_la_CFLAGS = -DRCU_BP
  
- libwfqueue_la_SOURCES = wfqueue.c $(COMPAT)
- libwfstack_la_SOURCES = wfstack.c $(COMPAT)
- librculfqueue_la_SOURCES = rculfqueue.c $(COMPAT)
- librculfstack_la_SOURCES = rculfstack.c $(COMPAT)
 +liburcu_rbtree_la_SOURCES = urcu-rbtree.c $(COMPAT)
 +
  pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = liburcu.pc liburcu-bp.pc
+ pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
+       liburcu-signal.pc liburcu-mb.pc

diff --cc tests/Makefile.am
index 7aced3aa373baa43be1407a43604932be0181186,999da17938d46aa34509a3c8dd05ec8697c5e796..d8431f4e853051121100bb474991c4b97eda2ff0
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -39,18 -38,18 +39,20 @@@ URCU_BP=$(top_srcdir)/urcu-bp.c $(top_s
  URCU_DEFER=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfqueue.c $(COMPAT)
  
  URCU_LIB=$(top_builddir)/liburcu.la
+ URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
  URCU_QSBR_LIB=$(top_builddir)/liburcu-qsbr.la
+ URCU_CDS_QSBR_LIB=$(top_builddir)/liburcu-cds-qsbr.la
  URCU_MB_LIB=$(top_builddir)/liburcu-mb.la
+ URCU_CDS_MB_LIB=$(top_builddir)/liburcu-cds-mb.la
  URCU_SIGNAL_LIB=$(top_builddir)/liburcu-signal.la
+ URCU_CDS_SIGNAL_LIB=$(top_builddir)/liburcu-cds-signal.la
  URCU_BP_LIB=$(top_builddir)/liburcu-bp.la
- WFQUEUE_LIB=$(top_builddir)/libwfqueue.la
- WFSTACK_LIB=$(top_builddir)/libwfstack.la
- RCULFQUEUE_LIB=$(top_builddir)/librculfqueue.la
- RCULFSTACK_LIB=$(top_builddir)/librculfstack.la
- URCU_RBTREE=$(URCU) $(top_srcdir)/urcu-rbtree.c
+ URCU_CDS_BP_LIB=$(top_builddir)/liburcu-cds-bp.la
+ URCU_CDS_COMMON_LIB=$(top_builddir)/liburcu-cds-common.la
  
- EXTRA_DIST = $(top_srcdir)/tests/api_*.h
++URCU_RBTREE=$(URCU) $(top_srcdir)/urcu-rbtree.c
 +
+ EXTRA_DIST = $(top_srcdir)/tests/api.h runall.sh
  
  test_urcu_SOURCES = test_urcu.c $(URCU)
  
@@@ -160,28 -159,26 +162,28 @@@ test_urcu_bp_SOURCES = test_urcu_bp.c $
  test_urcu_bp_dynamic_link_SOURCES = test_urcu_bp.c $(URCU_BP)
  test_urcu_bp_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  
- test_urcu_lfq_SOURCES = test_urcu_lfq.c $(URCU_DEFER)
- test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c $(URCU_DEFER)
+ test_urcu_lfq_SOURCES = test_urcu_lfq.c $(URCU) $(URCU_CDS_LIB)
+ test_urcu_lfq_dynlink_SOURCES = test_urcu_lfq.c $(URCU)
  test_urcu_lfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_lfq_dynlink_LDADD = $(RCULFQUEUE_LIB)
+ test_urcu_lfq_dynlink_LDADD = $(URCU_CDS_LIB)
  
- test_urcu_wfq_SOURCES = test_urcu_wfq.c
+ test_urcu_wfq_SOURCES = test_urcu_wfq.c $(URCU_CDS_COMMON_LIB) $(COMPAT)
  test_urcu_wfq_dynlink_SOURCES = test_urcu_wfq.c
  test_urcu_wfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_wfq_dynlink_LDADD = $(WFQUEUE_LIB)
+ test_urcu_wfq_dynlink_LDADD = $(URCU_CDS_COMMON_LIB)
  
- test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_DEFER)
+ test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_CDS_LIB) $(URCU_DEFER)
  test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU_DEFER)
  test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_lfs_dynlink_LDADD = $(RCULFSTACK_LIB)
+ test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB)
  
- test_urcu_wfs_SOURCES = test_urcu_wfs.c
+ test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_CDS_COMMON_LIB) $(COMPAT)
  test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c
  test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_wfs_dynlink_LDADD = $(WFSTACK_LIB)
+ test_urcu_wfs_dynlink_LDADD = $(URCU_CDS_COMMON_LIB)
  
 +test_urcu_rbtree_SOURCES = test_urcu_rbtree.c $(URCU_RBTREE)
 +
  urcutorture.c: api.h
  
  check-am: