X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-defer.h;h=3710081cd06a20d796eee3d5cfb8deea83204b27;hp=3e04c00fddb09d1cdd8465945eba4acbe385967a;hb=19d0e7ef8f7998fb256017ba2da414d78b3cb91b;hpb=804b437535f97b519db3e8715807950f5818cf27

diff --git a/urcu-defer.h b/urcu-defer.h
index 3e04c00..3710081 100644
--- a/urcu-defer.h
+++ b/urcu-defer.h
@@ -6,7 +6,7 @@
  *
  * Userspace RCU header - deferred execution
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * LGPL-compatible code should include this header with :
@@ -32,44 +32,36 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
+ * Note: the defer_rcu() API is currently EXPERIMENTAL. It may change in the
+ * future.
+ * 
  * Important !
  *
  * Each thread queuing memory reclamation must be registered with
  * rcu_defer_register_thread(). rcu_defer_unregister_thread() should be
  * called before the thread exits.
+ *
+ * *NEVER* use defer_rcu() within a RCU read-side critical section, because this
+ * primitive need to call synchronize_rcu() if the thread queue is full.
  */
 
-#ifdef _LGPL_SOURCE
-
-#include <urcu-defer-static.h>
-
-/*
- * Mappings for static use of the userspace RCU library.
- * Should only be used in LGPL-compatible code.
- */
-
-#define rcu_defer_queue	_rcu_defer_queue
-
-#else /* !_LGPL_SOURCE */
-
-/*
- * library wrappers to be used by non-LGPL compatible source code.
- */
-
-extern void rcu_defer_queue(void (*fct)(void *p), void *p);
-
-#endif /* !_LGPL_SOURCE */
-
-#define call_rcu		rcu_defer_queue
-#define rcu_reclaim_queue(p)	rcu_defer_queue(free, p)
+extern void defer_rcu(void (*fct)(void *p), void *p);
 
 /*
  * Thread registration for reclamation.
  */
-extern void rcu_defer_register_thread(void);
+extern int rcu_defer_register_thread(void);
 extern void rcu_defer_unregister_thread(void);
 extern void rcu_defer_barrier(void);
 extern void rcu_defer_barrier_thread(void);
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_BATCH_H */