X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Frculfstack.h;h=2d1ecceba729524700804f85821a73c03c1d0ba0;hb=d89ec7629b8cafdc12e619cf5f07ceb5b0279275;hp=ad83dbe771cd09adf33bf7446c102cecb24666c6;hpb=d4b99c015229978810319cfd42e1c9763772fad8;p=urcu.git

diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h
index ad83dbe..2d1ecce 100644
--- a/urcu/rculfstack.h
+++ b/urcu/rculfstack.h
@@ -27,6 +27,11 @@
 extern "C" {
 #endif
 
+#ifndef CDS_LFS_RCU_DEPRECATED
+#define CDS_LFS_RCU_DEPRECATED	\
+	__attribute__((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,36 +44,40 @@ 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 void cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rcu *node);
+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);
 
 /*
  * Should be called under rcu read lock critical section.
@@ -77,7 +86,8 @@ extern void cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rc
  * 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 */