X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=src%2Fworkqueue.c;h=e5931b5e74bfee68c3efd1ff61b53e9bc68af23f;hp=db0c63abf711307e995b3bd5cb372f560bd83711;hb=014775106c60f02818ca755b331f887030bd440f;hpb=1b6fc1735dcbdcb5c65f30bd9f80522edd9c4b24

diff --git a/src/workqueue.c b/src/workqueue.c
index db0c63a..e5931b5 100644
--- a/src/workqueue.c
+++ b/src/workqueue.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <signal.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -36,12 +35,13 @@
 #include <sched.h>
 
 #include "compat-getcpu.h"
-#include "urcu/wfcqueue.h"
-#include "urcu-pointer.h"
-#include "urcu/list.h"
-#include "urcu/futex.h"
-#include "urcu/tls-compat.h"
-#include "urcu/ref.h"
+#include <urcu/assert.h>
+#include <urcu/wfcqueue.h>
+#include <urcu/pointer.h>
+#include <urcu/list.h>
+#include <urcu/futex.h>
+#include <urcu/tls-compat.h>
+#include <urcu/ref.h>
 #include "urcu-die.h"
 
 #include "workqueue.h"
@@ -92,7 +92,7 @@ struct urcu_workqueue_completion_work {
  * Losing affinity can be caused by CPU hotunplug/hotplug, or by
  * cpuset(7).
  */
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 static int set_thread_cpu_affinity(struct urcu_workqueue *workqueue)
 {
 	cpu_set_t mask;
@@ -107,11 +107,8 @@ static int set_thread_cpu_affinity(struct urcu_workqueue *workqueue)
 
 	CPU_ZERO(&mask);
 	CPU_SET(workqueue->cpu_affinity, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-	ret = sched_setaffinity(0, &mask);
-#else
 	ret = sched_setaffinity(0, sizeof(mask), &mask);
-#endif
+
 	/*
 	 * EINVAL is fine: can be caused by hotunplugged CPUs, or by
 	 * cpuset(7). This is why we should always retry if we detect
@@ -124,7 +121,7 @@ static int set_thread_cpu_affinity(struct urcu_workqueue *workqueue)
 	return ret;
 }
 #else
-static int set_thread_cpu_affinity(struct urcu_workqueue *workqueue)
+static int set_thread_cpu_affinity(struct urcu_workqueue *workqueue __attribute__((unused)))
 {
 	return 0;
 }
@@ -213,19 +210,19 @@ static void *workqueue_thread(void *arg)
 		cds_wfcq_init(&cbs_tmp_head, &cbs_tmp_tail);
 		splice_ret = __cds_wfcq_splice_blocking(&cbs_tmp_head,
 			&cbs_tmp_tail, &workqueue->cbs_head, &workqueue->cbs_tail);
-		assert(splice_ret != CDS_WFCQ_RET_WOULDBLOCK);
-		assert(splice_ret != CDS_WFCQ_RET_DEST_NON_EMPTY);
+		urcu_posix_assert(splice_ret != CDS_WFCQ_RET_WOULDBLOCK);
+		urcu_posix_assert(splice_ret != CDS_WFCQ_RET_DEST_NON_EMPTY);
 		if (splice_ret != CDS_WFCQ_RET_SRC_EMPTY) {
 			if (workqueue->grace_period_fct)
 				workqueue->grace_period_fct(workqueue, workqueue->priv);
 			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,18 +235,18 @@ 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
 				 * urcu_work list.
 				 */
 				cmm_smp_mb();
-			} else {
-				(void) poll(NULL, 0, 10);
 			}
 		} else {
-			(void) poll(NULL, 0, 10);
+			if (cds_wfcq_empty(&workqueue->cbs_head,
+					&workqueue->cbs_tail)) {
+				(void) poll(NULL, 0, 10);
+			}
 		}
 		if (workqueue->worker_after_wake_up_fct)
 			workqueue->worker_after_wake_up_fct(workqueue, workqueue->priv);
@@ -339,7 +336,7 @@ void urcu_workqueue_destroy(struct urcu_workqueue *workqueue)
 	if (urcu_workqueue_destroy_worker(workqueue)) {
 		urcu_die(errno);
 	}
-	assert(cds_wfcq_empty(&workqueue->cbs_head, &workqueue->cbs_tail));
+	urcu_posix_assert(cds_wfcq_empty(&workqueue->cbs_head, &workqueue->cbs_tail));
 	free(workqueue);
 }