59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
|
From 136211f67b5ba804fd0e02603bcef61ac47dbc16 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
||
|
|
Date: Sun, 9 Dec 2018 06:31:57 -0500
|
||
|
|
Subject: [PATCH 06/15] Cleanup: workqueue: update comments referring to
|
||
|
|
call-rcu
|
||
|
|
|
||
|
|
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
||
|
|
---
|
||
|
|
src/workqueue.c | 12 +++++-------
|
||
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/workqueue.c b/src/workqueue.c
|
||
|
|
index 8561a7a..db0c63a 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;
|
||
|
|
@@ -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);
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|