projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
call_rcu: fix futex-based wakeup
[urcu.git]
/
urcu-call-rcu-impl.h
diff --git
a/urcu-call-rcu-impl.h
b/urcu-call-rcu-impl.h
index 69edd49f422dfdbe36524b64f7037ca66cec34fa..cfe1cce43618ea218c241fba4413941825b47b43 100644
(file)
--- a/
urcu-call-rcu-impl.h
+++ b/
urcu-call-rcu-impl.h
@@
-212,6
+212,11
@@
static void *call_rcu_thread(void *arg)
thread_call_rcu_data = crdp;
for (;;) {
thread_call_rcu_data = crdp;
for (;;) {
+ if (!(crdp->flags & URCU_CALL_RCU_RT)) {
+ uatomic_dec(&crdp->futex);
+ /* Decrement futex before reading call_rcu list */
+ cmm_smp_mb();
+ }
if (&crdp->cbs.head != _CMM_LOAD_SHARED(crdp->cbs.tail)) {
while ((cbs = _CMM_LOAD_SHARED(crdp->cbs.head)) == NULL)
poll(NULL, 0, 1);
if (&crdp->cbs.head != _CMM_LOAD_SHARED(crdp->cbs.tail)) {
while ((cbs = _CMM_LOAD_SHARED(crdp->cbs.head)) == NULL)
poll(NULL, 0, 1);
@@
-235,15
+240,21
@@
static void *call_rcu_thread(void *arg)
} while (cbs != NULL);
uatomic_sub(&crdp->qlen, cbcount);
}
} while (cbs != NULL);
uatomic_sub(&crdp->qlen, cbcount);
}
- if (crdp->flags & URCU_CALL_RCU_STOP)
+ if (crdp->flags & URCU_CALL_RCU_STOP) {
+ if (!(crdp->flags & URCU_CALL_RCU_RT)) {
+ /*
+ * Read call_rcu list before write futex.
+ */
+ cmm_smp_mb();
+ uatomic_set(&crdp->futex, 0);
+ }
break;
break;
- if (crdp->flags & URCU_CALL_RCU_RT)
- poll(NULL, 0, 10);
- else {
+ }
+ if (!(crdp->flags & URCU_CALL_RCU_RT)) {
if (&crdp->cbs.head == _CMM_LOAD_SHARED(crdp->cbs.tail))
call_rcu_wait(crdp);
if (&crdp->cbs.head == _CMM_LOAD_SHARED(crdp->cbs.tail))
call_rcu_wait(crdp);
- poll(NULL, 0, 10);
}
}
+ poll(NULL, 0, 10);
}
call_rcu_lock(&crdp->mtx);
crdp->flags |= URCU_CALL_RCU_STOPPED;
}
call_rcu_lock(&crdp->mtx);
crdp->flags |= URCU_CALL_RCU_STOPPED;
This page took
0.024484 seconds
and
4
git commands to generate.