diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-30 16:04:52 +0000 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2020-09-18 07:37:31 +0000 |
| commit | 90ed3c88f0b67120cbcc4fa9a8a9de6205903fa4 (patch) | |
| tree | 68b5fe75b8347afd52d5849d77f783b36b721de0 | |
| parent | e44b1f8ff11d3f6439b391c0b3314b6c9e92b8eb (diff) | |
| download | haskell-90ed3c88f0b67120cbcc4fa9a8a9de6205903fa4.tar.gz | |
rts/Schedule: Eliminate data races in run queue management
| -rw-r--r-- | rts/Schedule.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/rts/Schedule.h b/rts/Schedule.h index 66cf8391f3..c424f5ba57 100644 --- a/rts/Schedule.h +++ b/rts/Schedule.h @@ -171,10 +171,13 @@ popRunQueue (Capability *cap) StgTSO *t = cap->run_queue_hd; ASSERT(t != END_TSO_QUEUE); cap->run_queue_hd = t->_link; - if (t->_link != END_TSO_QUEUE) { - t->_link->block_info.prev = END_TSO_QUEUE; + + StgTSO *link = RELAXED_LOAD(&t->_link); + if (link != END_TSO_QUEUE) { + link->block_info.prev = END_TSO_QUEUE; } - t->_link = END_TSO_QUEUE; // no write barrier req'd + RELAXED_STORE(&t->_link, END_TSO_QUEUE); // no write barrier req'd + if (cap->run_queue_hd == END_TSO_QUEUE) { cap->run_queue_tl = END_TSO_QUEUE; } @@ -217,12 +220,18 @@ emptyQueue (StgTSO *q) INLINE_HEADER bool emptyRunQueue(Capability *cap) { + // Can only be called by the task owning the capability. + TSAN_ANNOTATE_BENIGN_RACE(&cap->n_run_queue, "emptyRunQueue"); return cap->n_run_queue == 0; } INLINE_HEADER void truncateRunQueue(Capability *cap) { + // Can only be called by the task owning the capability. + TSAN_ANNOTATE_BENIGN_RACE(&cap->run_queue_hd, "truncateRunQueue"); + TSAN_ANNOTATE_BENIGN_RACE(&cap->run_queue_tl, "truncateRunQueue"); + TSAN_ANNOTATE_BENIGN_RACE(&cap->n_run_queue, "truncateRunQueue"); cap->run_queue_hd = END_TSO_QUEUE; cap->run_queue_tl = END_TSO_QUEUE; cap->n_run_queue = 0; |