X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.h;h=0fa2fea7c4515a8c86be17673668692ac6692684;hp=e72b57416f730fb4775100e96ba2da86729846b6;hb=acfd099eae9026369f558e73b2a7e35860962d9d;hpb=ba59a0c7b244a0939a2298fc76a9002436ef9674 diff --git a/urcu.h b/urcu.h index e72b574..0fa2fea 100644 --- a/urcu.h +++ b/urcu.h @@ -6,7 +6,7 @@ * * Userspace RCU header * - * Copyright (c) 2009 Mathieu Desnoyers + * Copyright (c) 2009 Mathieu Desnoyers * Copyright (c) 2009 Paul E. McKenney, IBM Corporation. * * LGPL-compatible code should include this header with : @@ -34,12 +34,23 @@ #include #include +/* + * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers. + */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#include "urcu/map/urcu.h" + /* * Important ! * * Each thread containing read-side critical sections must be registered - * with rcu_register_thread() before calling rcu_read_lock(). - * rcu_unregister_thread() should be called before the thread exits. + * with rcu_register_thread_mb() before calling rcu_read_lock_mb(). + * rcu_unregister_thread_mb() should be called before the thread exits. */ #ifdef _LGPL_SOURCE @@ -51,43 +62,35 @@ * Should only be used in LGPL-compatible code. */ -#define rcu_dereference _rcu_dereference -#define rcu_read_lock _rcu_read_lock -#define rcu_read_unlock _rcu_read_unlock - -#define rcu_assign_pointer _rcu_assign_pointer -#define rcu_cmpxchg_pointer _rcu_cmpxchg_pointer -#define rcu_xchg_pointer _rcu_xchg_pointer -#define rcu_publish_content _rcu_publish_content +/* + * rcu_read_lock() + * rcu_read_unlock() + * + * Mark the beginning and end of a read-side critical section. + * DON'T FORGET TO USE RCU_REGISTER/UNREGISTER_THREAD() FOR EACH THREAD WITH + * READ-SIDE CRITICAL SECTION. + */ +#ifdef RCU_MEMBARRIER +#define rcu_read_lock_memb _rcu_read_lock +#define rcu_read_unlock_memb _rcu_read_unlock +#elif defined(RCU_SIGNAL) +#define rcu_read_lock_sig _rcu_read_lock +#define rcu_read_unlock_sig _rcu_read_unlock +#elif defined(RCU_MB) +#define rcu_read_lock_mb _rcu_read_lock +#define rcu_read_unlock_mb _rcu_read_unlock +#endif #else /* !_LGPL_SOURCE */ /* * library wrappers to be used by non-LGPL compatible source code. + * See LGPL-only urcu-pointer-static.h for documentation. */ extern void rcu_read_lock(void); extern void rcu_read_unlock(void); -extern void *rcu_dereference(void *p); - -extern void *rcu_assign_pointer_sym(void **p, void *v); - -#define rcu_assign_pointer(p, v) \ - rcu_assign_pointer_sym((void **)(p), (v)) - -extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new); -#define rcu_cmpxchg_pointer(p, old, _new) \ - rcu_cmpxchg_pointer_sym((void **)(p), (old), (_new)) - -extern void *rcu_xchg_pointer_sym(void **p, void *v); -#define rcu_xchg_pointer(p, v) \ - rcu_xchg_pointer_sym((void **)(p), (v)) - -extern void *rcu_publish_content_sym(void **p, void *v); -#define rcu_publish_content(p, v) \ - rcu_publish_content_sym((void **)(p), (v)) - #endif /* !_LGPL_SOURCE */ extern void synchronize_rcu(void); @@ -98,4 +101,16 @@ extern void synchronize_rcu(void); extern void rcu_register_thread(void); extern void rcu_unregister_thread(void); +/* + * Explicit rcu initialization, for "early" use within library constructors. + */ +extern void rcu_init(void); + +#ifdef __cplusplus +} +#endif + +#include "urcu-call-rcu.h" +#include "urcu-defer.h" + #endif /* _URCU_H */