projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: deadlock when thread join is issued in read-side C.S.
[urcu.git]
/
urcu.h
diff --git
a/urcu.h
b/urcu.h
index 0fa2fea7c4515a8c86be17673668692ac6692684..b8ca700ddcdb750270c5e39bd86080b559102363 100644
(file)
--- a/
urcu.h
+++ b/
urcu.h
@@
-35,7
+35,8
@@
#include <pthread.h>
/*
#include <pthread.h>
/*
- * 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 <urcu-pointer.h>
*/
#include <urcu-pointer.h>
@@
-43,7
+44,7
@@
extern "C" {
#endif
extern "C" {
#endif
-#include
"urcu/map/urcu.h"
+#include
<urcu/map/urcu.h>
/*
* Important !
/*
* Important !
@@
-55,7
+56,7
@@
extern "C" {
#ifdef _LGPL_SOURCE
#ifdef _LGPL_SOURCE
-#include <urcu
-static
.h>
+#include <urcu
/static/urcu
.h>
/*
* Mappings for static use of the userspace RCU library.
/*
* 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
#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
#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
#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.
#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 void rcu_read_lock(void);
extern void rcu_read_unlock(void);
+extern int rcu_read_ongoing(void);
#endif /* !_LGPL_SOURCE */
#endif /* !_LGPL_SOURCE */
@@
-106,11
+111,27
@@
extern void rcu_unregister_thread(void);
*/
extern void rcu_init(void);
*/
extern void rcu_init(void);
+/*
+ * 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
#ifdef __cplusplus
}
#endif
-#include "urcu-call-rcu.h"
-#include "urcu-defer.h"
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
+#include <urcu-flavor.h>
#endif /* _URCU_H */
#endif /* _URCU_H */
This page took
0.025389 seconds
and
4
git commands to generate.