From: Mathieu Desnoyers Date: Wed, 14 Dec 2011 20:41:18 +0000 (-0500) Subject: Merge branch 'master' into urcu/ht-shrink X-Git-Tag: v0.7.0~43^2~19 X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=87159645a8b732c34e502b0852f095da8e08800f;hp=1644042068ae8de26c9f6b85dcb2a5cd0b0f7608;p=urcu.git Merge branch 'master' into urcu/ht-shrink --- diff --git a/ChangeLog b/ChangeLog index b387acd..b9f8708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-12-12 Userspace RCU 0.6.7 + * Add compat file for test urcu wfs + * Add missing compat file for wfq test + * hlist.h: Add missing stddef.h include for NULL + * call_rcu: Add missing call_rcu_before_fork and + call_rcu_after_fork_parent declarations + * Describe autotools/libtool/automake version dependency + * Remove m4_ifdef for AC_PROG_LIBTOOL (deprecated) + * Support older autotools + * Apply autoupdate to configure.ac + * Fix build for amd64 environment (for FreeBSD 8.2) + * Add missing rcu_dereference_sym_bp + * Install test scripts in the dist tarball + 2011-11-03 Userspace RCU 0.6.6 * qsbr vs call_rcu : remove exit assertion * Rename likely/unlikely to caa_likely/caa_unlikely diff --git a/configure.ac b/configure.ac index ce06254..5a90008 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([userspace-rcu],[0.6.6],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([userspace-rcu],[0.6.7],[mathieu dot desnoyers at efficios dot com]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html diff --git a/tests/Makefile.am b/tests/Makefile.am index 05a8024..bbd72f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -160,7 +160,7 @@ 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 = $(URCU_CDS_LIB) -test_urcu_wfq_SOURCES = test_urcu_wfq.c $(URCU_COMMON_LIB) +test_urcu_wfq_SOURCES = test_urcu_wfq.c $(URCU_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 = $(URCU_COMMON_LIB) @@ -170,7 +170,7 @@ test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU) 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_COMMON_LIB) +test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_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 = $(URCU_COMMON_LIB) diff --git a/urcu-bp.h b/urcu-bp.h index 3623f35..5e42312 100644 --- a/urcu-bp.h +++ b/urcu-bp.h @@ -87,13 +87,10 @@ extern "C" { * See LGPL-only urcu/static/urcu-pointer.h for documentation. */ -extern void rcu_read_lock(void) - __attribute__((weak)); -extern void rcu_read_unlock(void) - __attribute__((weak)); +extern void rcu_read_lock(void); +extern void rcu_read_unlock(void); -extern void *rcu_dereference_sym_bp(void *p) - __attribute__((weak)); +extern void *rcu_dereference_sym_bp(void *p); #define rcu_dereference_bp(p) \ ({ \ typeof(p) _________p1 = URCU_FORCE_CAST(typeof(p), \ @@ -101,8 +98,7 @@ extern void *rcu_dereference_sym_bp(void *p) (_________p1); \ }) -extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new) - __attribute__((weak)); +extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new); #define rcu_cmpxchg_pointer_bp(p, old, _new) \ ({ \ typeof(*(p)) _________pold = (old); \ @@ -114,8 +110,7 @@ extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new) (_________p1); \ }) -extern void *rcu_xchg_pointer_sym_bp(void **p, void *v) - __attribute__((weak)); +extern void *rcu_xchg_pointer_sym_bp(void **p, void *v); #define rcu_xchg_pointer_bp(p, v) \ ({ \ typeof(*(p)) _________pv = (v); \ @@ -125,8 +120,7 @@ extern void *rcu_xchg_pointer_sym_bp(void **p, void *v) (_________p1); \ }) -extern void *rcu_set_pointer_sym_bp(void **p, void *v) - __attribute__((weak)); +extern void *rcu_set_pointer_sym_bp(void **p, void *v); #define rcu_set_pointer_bp(p, v) \ ({ \ typeof(*(p)) _________pv = (v); \