diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-01 11:57:58 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-24 21:00:57 -0400 |
| commit | 1f4cbc2942ad8b757a225b23c9f097f371ca490c (patch) | |
| tree | 90addcca86d96b2fef9293df93212af0d19cf557 | |
| parent | bf1b0bc78da7dbe5f6fbda54b37a9cb165ff857f (diff) | |
| download | haskell-1f4cbc2942ad8b757a225b23c9f097f371ca490c.tar.gz | |
rts/BlockAlloc: Use relaxed operations
| -rw-r--r-- | rts/sm/BlockAlloc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rts/sm/BlockAlloc.c b/rts/sm/BlockAlloc.c index 2bf497197e..9ef5e3c2d2 100644 --- a/rts/sm/BlockAlloc.c +++ b/rts/sm/BlockAlloc.c @@ -796,7 +796,7 @@ freeGroup(bdescr *p) // not true in multithreaded GC: // ASSERT_SM_LOCK(); - ASSERT(p->free != (P_)-1); + ASSERT(RELAXED_LOAD(&p->free) != (P_)-1); #if defined(DEBUG) for (uint32_t i=0; i < p->blocks; i++) { @@ -806,9 +806,9 @@ freeGroup(bdescr *p) node = p->node; - p->free = (void *)-1; /* indicates that this block is free */ - p->gen = NULL; - p->gen_no = 0; + RELAXED_STORE(&p->free, (void *) -1); /* indicates that this block is free */ + RELAXED_STORE(&p->gen, NULL); + RELAXED_STORE(&p->gen_no, 0); /* fill the block group with garbage if sanity checking is on */ IF_DEBUG(zero_on_gc, memset(p->start, 0xaa, (W_)p->blocks * BLOCK_SIZE)); @@ -834,7 +834,8 @@ freeGroup(bdescr *p) { bdescr *next; next = p + p->blocks; - if (next <= LAST_BDESCR(MBLOCK_ROUND_DOWN(p)) && next->free == (P_)-1) + if (next <= LAST_BDESCR(MBLOCK_ROUND_DOWN(p)) + && RELAXED_LOAD(&next->free) == (P_)-1) { p->blocks += next->blocks; ln = log_2(next->blocks); @@ -855,7 +856,7 @@ freeGroup(bdescr *p) prev = p - 1; if (prev->blocks == 0) prev = prev->link; // find the head - if (prev->free == (P_)-1) + if (RELAXED_LOAD(&prev->free) == (P_)-1) { ln = log_2(prev->blocks); dbl_link_remove(prev, &free_list[node][ln]); |