X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfstack.h;h=c7e5599d07fa12f13573c6dd877432be08a120e9;hp=cf00daf26cc65cf09d300dafb91dd73467cf6f42;hb=b0a841b4ff807dd29fe0cdbfe24900312f0e627b;hpb=e1a3b81e201ccfd019dae3778bd6ba0bd1e545e4

diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h
index cf00daf..c7e5599 100644
--- a/urcu/rculfstack.h
+++ b/urcu/rculfstack.h
@@ -23,10 +23,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <urcu/compiler.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef CDS_LFS_RCU_DEPRECATED
+#define CDS_LFS_RCU_DEPRECATED	\
+	CDS_DEPRECATED("urcu/rculfstack.h is deprecated. Please use urcu/lfstack.h instead.")
+#endif
+
 struct cds_lfs_node_rcu {
 	struct cds_lfs_node_rcu *next;
 };
@@ -39,46 +46,50 @@ struct cds_lfs_stack_rcu {
 
 #include <urcu/static/rculfstack.h>
 
-#define cds_lfs_node_init_rcu_qsbr	_cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu_qsbr		_cds_lfs_init_rcu
-#define cds_lfs_push_rcu_qsbr		_cds_lfs_push_rcu
-#define cds_lfs_pop_rcu_qsbr		_cds_lfs_pop_rcu
-
-#define cds_lfs_node_init_rcu_bp	_cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu_bp		_cds_lfs_init_rcu
-#define cds_lfs_push_rcu_bp		_cds_lfs_push_rcu
-#define cds_lfs_pop_rcu_bp		_cds_lfs_pop_rcu
+static inline CDS_LFS_RCU_DEPRECATED
+void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node)
+{
+	_cds_lfs_node_init_rcu(node);
+}
 
-#define cds_lfs_node_init_rcu_memb	_cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu_memb		_cds_lfs_init_rcu
-#define cds_lfs_push_rcu_memb		_cds_lfs_push_rcu
-#define cds_lfs_pop_rcu_memb		_cds_lfs_pop_rcu
+static inline
+void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s)
+{
+	_cds_lfs_init_rcu(s);
+}
 
-#define cds_lfs_node_init_rcu_mb	_cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu_mb		_cds_lfs_init_rcu
-#define cds_lfs_push_rcu_mb		_cds_lfs_push_rcu
-#define cds_lfs_pop_rcu_mb		_cds_lfs_pop_rcu
+static inline CDS_LFS_RCU_DEPRECATED
+int cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s,
+			struct cds_lfs_node_rcu *node)
+{
+	return _cds_lfs_push_rcu(s, node);
+}
 
-#define cds_lfs_node_init_rcu_sig	_cds_lfs_node_init_rcu
-#define cds_lfs_init_rcu_sig		_cds_lfs_init_rcu
-#define cds_lfs_push_rcu_sig		_cds_lfs_push_rcu
-#define cds_lfs_pop_rcu_sig		_cds_lfs_pop_rcu
+static inline CDS_LFS_RCU_DEPRECATED
+struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s)
+{
+	return _cds_lfs_pop_rcu(s);
+}
 
 #else /* !_LGPL_SOURCE */
 
-extern void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node);
-extern void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s);
-extern int cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s,
+extern CDS_LFS_RCU_DEPRECATED
+void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node);
+extern CDS_LFS_RCU_DEPRECATED
+void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s);
+extern CDS_LFS_RCU_DEPRECATED
+int cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s,
 			struct cds_lfs_node_rcu *node);
 
 /*
- * Acts as a RCU reader.
+ * Should be called under rcu read lock critical section.
  *
  * The caller must wait for a grace period to pass before freeing the returned
  * node or modifying the cds_lfs_node_rcu structure.
  * Returns NULL if stack is empty.
  */
-extern struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s);
+extern CDS_LFS_RCU_DEPRECATED
+struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s);
 
 #endif /* !_LGPL_SOURCE */