X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=src%2Fworkqueue.c;h=6707ffe3b45e2c2226d99c3b163d4e1c820028aa;hp=8561a7a817dfd1dac7fff3aa4353682fc55edc79;hb=d25f25df027b158726f8a361e52f0e3a7529d5eb;hpb=9db9edccbed8465728f0bd9db12e03bd6f291726

diff --git a/src/workqueue.c b/src/workqueue.c
index 8561a7a..6707ffe 100644
--- a/src/workqueue.c
+++ b/src/workqueue.c
@@ -37,7 +37,6 @@
 
 #include "compat-getcpu.h"
 #include "urcu/wfcqueue.h"
-#include "urcu-call-rcu.h"
 #include "urcu-pointer.h"
 #include "urcu/list.h"
 #include "urcu/futex.h"
@@ -55,10 +54,9 @@
 struct urcu_workqueue {
 	/*
 	 * We do not align head on a different cache-line than tail
-	 * mainly because call_rcu callback-invocation threads use
-	 * batching ("splice") to get an entire list of callbacks, which
-	 * effectively empties the queue, and requires to touch the tail
-	 * anyway.
+	 * mainly because workqueue threads use batching ("splice") to
+	 * get an entire list of callbacks, which effectively empties
+	 * the queue, and requires to touch the tail anyway.
 	 */
 	struct cds_wfcq_tail cbs_tail;
 	struct cds_wfcq_head cbs_head;
@@ -223,11 +221,11 @@ static void *workqueue_thread(void *arg)
 			cbcount = 0;
 			__cds_wfcq_for_each_blocking_safe(&cbs_tmp_head,
 					&cbs_tmp_tail, cbs, cbs_tmp_n) {
-				struct rcu_head *rhp;
+				struct urcu_work *uwp;
 
-				rhp = caa_container_of(cbs,
-					struct rcu_head, next);
-				rhp->func(rhp);
+				uwp = caa_container_of(cbs,
+					struct urcu_work, next);
+				uwp->func(uwp);
 				cbcount++;
 			}
 			uatomic_sub(&workqueue->qlen, cbcount);
@@ -244,7 +242,7 @@ static void *workqueue_thread(void *arg)
 				uatomic_dec(&workqueue->futex);
 				/*
 				 * Decrement futex before reading
-				 * call_rcu list.
+				 * urcu_work list.
 				 */
 				cmm_smp_mb();
 			} else {
@@ -258,7 +256,7 @@ static void *workqueue_thread(void *arg)
 	}
 	if (!rt) {
 		/*
-		 * Read call_rcu list before write futex.
+		 * Read urcu_work list before write futex.
 		 */
 		cmm_smp_mb();
 		uatomic_set(&workqueue->futex, 0);