X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=wfcqueue.c;h=85de8ecf9b29531b6cd1245dda4ca06cc8fde310;hp=90b810e23494000ae6620f0d1505b8d7247a5f10;hb=2af1c19e6a553878fcb2a5106f050d5ed7ac0f54;hpb=852a17ad88c691a96a67754bce91826b33877812

diff --git a/wfcqueue.c b/wfcqueue.c
index 90b810e..85de8ec 100644
--- a/wfcqueue.c
+++ b/wfcqueue.c
@@ -1,7 +1,7 @@
 /*
  * wfcqueue.c
  *
- * Userspace RCU library - Concurrent queue with Wait-Free Enqueue/Blocking Dequeue
+ * Userspace RCU library - Concurrent Queue with Wait-Free Enqueue/Blocking Dequeue
  *
  * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright 2011-2012 - Lai Jiangshan <laijs@cn.fujitsu.com>
@@ -40,18 +40,30 @@ void cds_wfcq_init(struct cds_wfcq_head *head,
 	_cds_wfcq_init(head, tail);
 }
 
-bool cds_wfcq_empty(struct cds_wfcq_head *head,
+void cds_wfcq_destroy(struct cds_wfcq_head *head,
+		struct cds_wfcq_tail *tail)
+{
+	_cds_wfcq_destroy(head, tail);
+}
+
+void __cds_wfcq_init(struct __cds_wfcq_head *head,
+		struct cds_wfcq_tail *tail)
+{
+	___cds_wfcq_init(head, tail);
+}
+
+bool cds_wfcq_empty(cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail)
 
 {
 	return _cds_wfcq_empty(head, tail);
 }
 
-void cds_wfcq_enqueue(struct cds_wfcq_head *head,
+bool cds_wfcq_enqueue(cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {
-	_cds_wfcq_enqueue(head, tail, node);
+	return _cds_wfcq_enqueue(head, tail, node);
 }
 
 void cds_wfcq_dequeue_lock(struct cds_wfcq_head *head,
@@ -73,44 +85,68 @@ struct cds_wfcq_node *cds_wfcq_dequeue_blocking(
 	return _cds_wfcq_dequeue_blocking(head, tail);
 }
 
-void cds_wfcq_splice_blocking(
+struct cds_wfcq_node *cds_wfcq_dequeue_with_state_blocking(
+		struct cds_wfcq_head *head,
+		struct cds_wfcq_tail *tail,
+		int *state)
+{
+	return _cds_wfcq_dequeue_with_state_blocking(head, tail, state);
+}
+
+enum cds_wfcq_ret cds_wfcq_splice_blocking(
 		struct cds_wfcq_head *dest_q_head,
 		struct cds_wfcq_tail *dest_q_tail,
 		struct cds_wfcq_head *src_q_head,
 		struct cds_wfcq_tail *src_q_tail)
 {
-	_cds_wfcq_splice_blocking(dest_q_head, dest_q_tail,
+	return _cds_wfcq_splice_blocking(dest_q_head, dest_q_tail,
 				src_q_head, src_q_tail);
 }
 
 struct cds_wfcq_node *__cds_wfcq_dequeue_blocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail)
 {
 	return ___cds_wfcq_dequeue_blocking(head, tail);
 }
 
+struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_blocking(
+		cds_wfcq_head_ptr_t head,
+		struct cds_wfcq_tail *tail,
+		int *state)
+{
+	return ___cds_wfcq_dequeue_with_state_blocking(head, tail, state);
+}
+
 struct cds_wfcq_node *__cds_wfcq_dequeue_nonblocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail)
 {
 	return ___cds_wfcq_dequeue_nonblocking(head, tail);
 }
 
-void __cds_wfcq_splice_blocking(
-		struct cds_wfcq_head *dest_q_head,
+struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_nonblocking(
+		cds_wfcq_head_ptr_t head,
+		struct cds_wfcq_tail *tail,
+		int *state)
+{
+	return ___cds_wfcq_dequeue_with_state_nonblocking(head, tail, state);
+}
+
+enum cds_wfcq_ret __cds_wfcq_splice_blocking(
+		cds_wfcq_head_ptr_t dest_q_head,
 		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
+		cds_wfcq_head_ptr_t src_q_head,
 		struct cds_wfcq_tail *src_q_tail)
 {
-	___cds_wfcq_splice_blocking(dest_q_head, dest_q_tail,
+	return ___cds_wfcq_splice_blocking(dest_q_head, dest_q_tail,
 				src_q_head, src_q_tail);
 }
 
-int __cds_wfcq_splice_nonblocking(
-		struct cds_wfcq_head *dest_q_head,
+enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
+		cds_wfcq_head_ptr_t dest_q_head,
 		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
+		cds_wfcq_head_ptr_t src_q_head,
 		struct cds_wfcq_tail *src_q_tail)
 {
 	return ___cds_wfcq_splice_nonblocking(dest_q_head, dest_q_tail,
@@ -118,21 +154,21 @@ int __cds_wfcq_splice_nonblocking(
 }
 
 struct cds_wfcq_node *__cds_wfcq_first_blocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail)
 {
 	return ___cds_wfcq_first_blocking(head, tail);
 }
 
 struct cds_wfcq_node *__cds_wfcq_first_nonblocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail)
 {
 	return ___cds_wfcq_first_nonblocking(head, tail);
 }
 
 struct cds_wfcq_node *__cds_wfcq_next_blocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {
@@ -140,7 +176,7 @@ struct cds_wfcq_node *__cds_wfcq_next_blocking(
 }
 
 struct cds_wfcq_node *__cds_wfcq_next_nonblocking(
-		struct cds_wfcq_head *head,
+		cds_wfcq_head_ptr_t head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {