diff options
Diffstat (limited to 'rts/Capability.h')
| -rw-r--r-- | rts/Capability.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rts/Capability.h b/rts/Capability.h index 7eaffa0225..aab2d84ae7 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -482,8 +482,12 @@ contextSwitchCapability (Capability *cap) INLINE_HEADER bool emptyInbox(Capability *cap) { - return (cap->inbox == (Message*)END_TSO_QUEUE && - cap->putMVars == NULL); + // This may race with writes to putMVars and inbox but this harmless for the + // intended uses of this function. + TSAN_ANNOTATE_BENIGN_RACE(&cap->putMVars, "emptyInbox(cap->putMVars)"); + TSAN_ANNOTATE_BENIGN_RACE(&cap->inbox, "emptyInbox(cap->inbox)"); + return (RELAXED_LOAD(&cap->inbox) == (Message*)END_TSO_QUEUE && + RELAXED_LOAD(&cap->putMVars) == NULL); } #endif |