From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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/?p=urcu.git;a=commitdiff_plain;h=87159645a8b732c34e502b0852f095da8e08800f;hp=-c

Merge branch 'master' into urcu/ht-shrink
---

87159645a8b732c34e502b0852f095da8e08800f
diff --combined tests/Makefile.am
index 05a8024,9b7839b..bbd72f8
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -15,7 -15,7 +15,7 @@@ noinst_PROGRAMS = test_urcu test_urcu_d
          test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \
  	test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \
  	test_urcu_wfq_dynlink test_urcu_wfs_dynlink \
 -	test_urcu_lfq_dynlink test_urcu_lfs_dynlink
 +	test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash
  noinst_HEADERS = rcutorture.h
  
  if COMPAT_ARCH
@@@ -160,7 -160,7 +160,7 @@@ test_urcu_lfq_dynlink_SOURCES = test_ur
  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,15 -170,11 +170,15 @@@ 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_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)
  
 +test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT)
 +test_urcu_hash_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
 +test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB)
 +
  urcutorture.c: api.h
  
  check-am:
diff --combined urcu-bp.h
index 3623f35,28531c9..5e42312
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@@ -87,13 -87,10 +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 +98,7 @@@
  		(_________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 +110,7 @@@
  		(_________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 +120,7 @@@
  		(_________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);			             \
@@@ -186,6 -180,5 +180,6 @@@ static inline void rcu_thread_online(vo
  
  #include <urcu-call-rcu.h>
  #include <urcu-defer.h>
 +#include <urcu-flavor.h>
  
  #endif /* _URCU_BP_H */