X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=wfstack.c;h=46300f92ce061176a4b2fe9339a85891c5d8f0e7;hp=48f290c31cdd23df800ff7d356035923e5f6d5e3;hb=200d100e05ed8e10c47f971939042f2406df92ef;hpb=edac6b69ad8b690437c4624cebb7eef465a09a7e

diff --git a/wfstack.c b/wfstack.c
index 48f290c..46300f9 100644
--- a/wfstack.c
+++ b/wfstack.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - Stack with wait-free push, blocking traversal.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,14 +38,24 @@ void cds_wfs_init(struct cds_wfs_stack *s)
 	_cds_wfs_init(s);
 }
 
-bool cds_wfs_empty(struct cds_wfs_stack *s)
+void cds_wfs_destroy(struct cds_wfs_stack *s)
 {
-	return _cds_wfs_empty(s);
+	_cds_wfs_destroy(s);
 }
 
-int cds_wfs_push(struct cds_wfs_stack *s, struct cds_wfs_node *node)
+void __cds_wfs_init(struct __cds_wfs_stack *s)
 {
-	return _cds_wfs_push(s, node);
+	___cds_wfs_init(s);
+}
+
+bool cds_wfs_empty(cds_wfs_stack_ptr_t u_stack)
+{
+	return _cds_wfs_empty(u_stack);
+}
+
+int cds_wfs_push(cds_wfs_stack_ptr_t u_stack, struct cds_wfs_node *node)
+{
+	return _cds_wfs_push(u_stack, node);
 }
 
 struct cds_wfs_node *cds_wfs_pop_blocking(struct cds_wfs_stack *s)
@@ -53,14 +63,20 @@ struct cds_wfs_node *cds_wfs_pop_blocking(struct cds_wfs_stack *s)
 	return _cds_wfs_pop_blocking(s);
 }
 
+struct cds_wfs_node *
+	cds_wfs_pop_with_state_blocking(struct cds_wfs_stack *s, int *state)
+{
+	return _cds_wfs_pop_with_state_blocking(s, state);
+}
+
 struct cds_wfs_head *cds_wfs_pop_all_blocking(struct cds_wfs_stack *s)
 {
 	return _cds_wfs_pop_all_blocking(s);
 }
 
-struct cds_wfs_node *cds_wfs_first_blocking(struct cds_wfs_head *head)
+struct cds_wfs_node *cds_wfs_first(struct cds_wfs_head *head)
 {
-	return _cds_wfs_first_blocking(head);
+	return _cds_wfs_first(head);
 }
 
 struct cds_wfs_node *cds_wfs_next_blocking(struct cds_wfs_node *node)
@@ -68,6 +84,11 @@ struct cds_wfs_node *cds_wfs_next_blocking(struct cds_wfs_node *node)
 	return _cds_wfs_next_blocking(node);
 }
 
+struct cds_wfs_node *cds_wfs_next_nonblocking(struct cds_wfs_node *node)
+{
+	return _cds_wfs_next_nonblocking(node);
+}
+
 void cds_wfs_pop_lock(struct cds_wfs_stack *s)
 {
 	_cds_wfs_pop_lock(s);
@@ -78,12 +99,31 @@ void cds_wfs_pop_unlock(struct cds_wfs_stack *s)
 	_cds_wfs_pop_unlock(s);
 }
 
-struct cds_wfs_node *__cds_wfs_pop_blocking(struct cds_wfs_stack *s)
+struct cds_wfs_node *__cds_wfs_pop_blocking(cds_wfs_stack_ptr_t u_stack)
+{
+	return ___cds_wfs_pop_blocking(u_stack);
+}
+
+struct cds_wfs_node *
+	__cds_wfs_pop_with_state_blocking(cds_wfs_stack_ptr_t u_stack,
+		int *state)
+{
+	return ___cds_wfs_pop_with_state_blocking(u_stack, state);
+}
+
+struct cds_wfs_node *__cds_wfs_pop_nonblocking(cds_wfs_stack_ptr_t u_stack)
+{
+	return ___cds_wfs_pop_nonblocking(u_stack);
+}
+
+struct cds_wfs_node *
+	__cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_ptr_t u_stack,
+		int *state)
 {
-	return ___cds_wfs_pop_blocking(s);
+	return ___cds_wfs_pop_with_state_nonblocking(u_stack, state);
 }
 
-struct cds_wfs_head *__cds_wfs_pop_all(struct cds_wfs_stack *s)
+struct cds_wfs_head *__cds_wfs_pop_all(cds_wfs_stack_ptr_t u_stack)
 {
-	return ___cds_wfs_pop_all(s);
+	return ___cds_wfs_pop_all(u_stack);
 }