X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.h;h=85d4a4cdd47db666dfc4cee9c9e80d0879c5c956;hp=0fa2fea7c4515a8c86be17673668692ac6692684;hb=d1c678425415ed986d0101d5d9ab228b160b2fc3;hpb=57760d447eaed07f8a9c6552b8cefc6223ac1158 diff --git a/urcu.h b/urcu.h index 0fa2fea..85d4a4c 100644 --- a/urcu.h +++ b/urcu.h @@ -35,15 +35,16 @@ #include /* - * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers. + * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * publication headers. */ #include #ifdef __cplusplus extern "C" { -#endif +#endif -#include "urcu/map/urcu.h" +#include /* * Important ! @@ -55,7 +56,7 @@ extern "C" { #ifdef _LGPL_SOURCE -#include +#include /* * Mappings for static use of the userspace RCU library. @@ -73,23 +74,27 @@ extern "C" { #ifdef RCU_MEMBARRIER #define rcu_read_lock_memb _rcu_read_lock #define rcu_read_unlock_memb _rcu_read_unlock +#define rcu_read_ongoing_memb _rcu_read_ongoing #elif defined(RCU_SIGNAL) #define rcu_read_lock_sig _rcu_read_lock #define rcu_read_unlock_sig _rcu_read_unlock +#define rcu_read_ongoing_sig _rcu_read_ongoing #elif defined(RCU_MB) #define rcu_read_lock_mb _rcu_read_lock #define rcu_read_unlock_mb _rcu_read_unlock +#define rcu_read_ongoing_mb _rcu_read_ongoing #endif #else /* !_LGPL_SOURCE */ /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu-pointer-static.h for documentation. + * See LGPL-only urcu/static/urcu-pointer.h for documentation. */ extern void rcu_read_lock(void); extern void rcu_read_unlock(void); +extern int rcu_read_ongoing(void); #endif /* !_LGPL_SOURCE */ @@ -106,11 +111,27 @@ extern void rcu_unregister_thread(void); */ extern void rcu_init(void); -#ifdef __cplusplus +/* + * Q.S. reporting are no-ops for these URCU flavors. + */ +static inline void rcu_quiescent_state(void) +{ +} + +static inline void rcu_thread_offline(void) +{ +} + +static inline void rcu_thread_online(void) +{ +} + +#ifdef __cplusplus } #endif -#include "urcu-call-rcu.h" -#include "urcu-defer.h" +#include +#include +#include #endif /* _URCU_H */