From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 3 Sep 2011 14:44:43 +0000 (-0400)
Subject: Merge branch 'master' into rbtree2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f4a45eb86d7a2ed95c808fb54abf8fee88220266;p=urcu.git

Merge branch 'master' into rbtree2

Conflicts:
	Makefile.am

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

f4a45eb86d7a2ed95c808fb54abf8fee88220266
diff --cc Makefile.am
index a1609b3,0cde84a..8f06cf9
--- a/Makefile.am
+++ b/Makefile.am
@@@ -34,21 -33,22 +34,22 @@@ if COMPAT_FUTE
  COMPAT+=compat_futex.c
  endif
  
- lib_LTLIBRARIES = liburcu-cds-common.la \
+ lib_LTLIBRARIES = liburcu-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-rbtree.la
 -		liburcu-cds.la
++		liburcu-cds.la liburcu-rbtree.la
  
- liburcu_cds_common_la_SOURCES = wfqueue.c wfstack.c $(COMPAT)
+ #
+ # liburcu-common contains wait-free queues (needed by call_rcu) as well
+ # as futex fallbacks.
+ #
+ liburcu_common_la_SOURCES = wfqueue.c wfstack.c $(COMPAT)
  
  liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
- liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
+ liburcu_la_LIBADD = liburcu-common.la
  
  liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
- liburcu_cds_qsbr_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
- liburcu_cds_qsbr_la_CFLAGS = -DRCU_QSBR
+ liburcu_qsbr_la_LIBADD = liburcu-common.la
  
  liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_mb_la_CFLAGS = -DRCU_MB
@@@ -57,15 -56,14 +57,16 @@@ liburcu_mb_la_LIBADD = liburcu-common.l
  
  liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
- liburcu_cds_signal_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
- liburcu_cds_signal_la_CFLAGS = -DRCU_SIGNAL
+ liburcu_signal_la_LIBADD = liburcu-common.la
  
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
- liburcu_cds_bp_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
- liburcu_cds_bp_la_CFLAGS = -DRCU_BP
+ liburcu_bp_la_LIBADD = liburcu-common.la
+ 
+ liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
+ liburcu_cds_la_LIBADD = liburcu-common.la
  
 +liburcu_rbtree_la_SOURCES = urcu-rbtree.c $(COMPAT)
 +
  pkgconfigdir = $(libdir)/pkgconfig
  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 d8431f4,399fe9c..51e961c
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -38,20 -37,14 +38,16 @@@ URCU_SIGNAL=$(top_srcdir)/urcu.c $(top_
  URCU_BP=$(top_srcdir)/urcu-bp.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfqueue.c $(COMPAT)
  URCU_DEFER=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfqueue.c $(COMPAT)
  
+ URCU_COMMON_LIB=$(top_builddir)/liburcu-common.la
  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
- URCU_CDS_BP_LIB=$(top_builddir)/liburcu-cds-bp.la
- URCU_CDS_COMMON_LIB=$(top_builddir)/liburcu-cds-common.la
+ URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
  
 +URCU_RBTREE=$(URCU) $(top_srcdir)/urcu-rbtree.c
 +
  EXTRA_DIST = $(top_srcdir)/tests/api.h runall.sh
  
  test_urcu_SOURCES = test_urcu.c $(URCU)
@@@ -177,13 -170,11 +173,13 @@@ test_urcu_lfs_dynlink_SOURCES = test_ur
  test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB)
  
- test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_CDS_COMMON_LIB) $(COMPAT)
+ test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_COMMON_LIB)
  test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c
  test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_wfs_dynlink_LDADD = $(URCU_CDS_COMMON_LIB)
+ test_urcu_wfs_dynlink_LDADD = $(URCU_COMMON_LIB)
  
 +test_urcu_rbtree_SOURCES = test_urcu_rbtree.c $(URCU_RBTREE)
 +
  urcutorture.c: api.h
  
  check-am: