X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fworkqueue.c;h=0b1a9eae41f91ba5bad8dc7e43db2731707d8854;hb=73d8b52e55af02475eb693a33b36fcfbcf761c9a;hp=db0c63abf711307e995b3bd5cb372f560bd83711;hpb=1b6fc1735dcbdcb5c65f30bd9f80522edd9c4b24;p=urcu.git

diff --git a/src/workqueue.c b/src/workqueue.c
index db0c63a..0b1a9ea 100644
--- a/src/workqueue.c
+++ b/src/workqueue.c
@@ -221,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);
@@ -238,7 +238,6 @@ static void *workqueue_thread(void *arg)
 			if (cds_wfcq_empty(&workqueue->cbs_head,
 					&workqueue->cbs_tail)) {
 				futex_wait(&workqueue->futex);
-				(void) poll(NULL, 0, 10);
 				uatomic_dec(&workqueue->futex);
 				/*
 				 * Decrement futex before reading