X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fworkqueue-fifo.h;h=a3d1e72b2782a0afeeb6a438d64825b6a1d1c6cb;hb=db9916c6618c4da50d5f2779af1640cab1ebcfed;hp=883f41f3feec4c0869f27c794f44a420ba80fdb5;hpb=a649215929e3af5a0dd26d9fc5bb9ed49e677773;p=userspace-rcu.git

diff --git a/urcu/workqueue-fifo.h b/urcu/workqueue-fifo.h
index 883f41f..a3d1e72 100644
--- a/urcu/workqueue-fifo.h
+++ b/urcu/workqueue-fifo.h
@@ -86,6 +86,7 @@ void urcu_workqueue_init(struct urcu_workqueue *queue)
 	__cds_wfcq_init(&queue->head, &queue->tail);
 	urcu_wait_queue_init(&queue->waitqueue);
 	CDS_INIT_LIST_HEAD(&queue->sibling_head);
+	pthread_mutex_init(&queue->sibling_lock, NULL);
 	queue->shutdown = false;
 }
 
@@ -138,6 +139,7 @@ void urcu_worker_init(struct urcu_worker *worker, int flags)
 	worker->flags = flags;
 	urcu_wait_node_init(&worker->wait_node, URCU_WAIT_RUNNING);
 	worker->own = NULL;
+	worker->wait_node.node.next = NULL;
 }
 
 static inline
@@ -204,7 +206,7 @@ bool ___urcu_grab_work(struct urcu_worker *worker,
 		bool steal)
 {
 	enum cds_wfcq_ret splice_ret;
-	struct cds_wfcq_head tmp_head;
+	struct __cds_wfcq_head tmp_head;
 	struct cds_wfcq_tail tmp_tail;
 	struct cds_wfcq_node *node;
 
@@ -213,7 +215,7 @@ bool ___urcu_grab_work(struct urcu_worker *worker,
 	 */
 	if (cds_wfcq_empty(src_head, src_tail))
 		return false;
-	cds_wfcq_init(&tmp_head, &tmp_tail);
+	__cds_wfcq_init(&tmp_head, &tmp_tail);
 
 	/* Ensure that we preserve FIFO work order. */
 	assert(!steal || worker->own == NULL);
@@ -254,7 +256,7 @@ got_node:
 	}
 
 	/* Splice into worker workqueue. */
-	splice_ret = cds_wfcq_splice_blocking(&worker->head,
+	splice_ret = __cds_wfcq_splice_blocking(&worker->head,
 			&worker->tail,
 			&tmp_head,
 			&tmp_tail);