diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-09-04 10:37:10 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-09-04 11:00:32 +0100 |
| commit | aa779e092c4f4d6a6691f3a4fc4074e6359337f8 (patch) | |
| tree | f4c4e22da3aa71eff569b01af603836d7b5fd6a5 /rts/RetainerProfile.c | |
| parent | 5a3918febb7354e0900c4f04151599d833716032 (diff) | |
| download | haskell-aa779e092c4f4d6a6691f3a4fc4074e6359337f8.tar.gz | |
Don't move Capabilities in setNumCapabilities (#8209)
We have various problems with reallocating the array of Capabilities,
due to threads in waitForReturnCapability that are already holding a
pointer to a Capability.
Rather than add more locking to make this safer, I decided it would be
easier to ensure that we never move the Capabilities at all. The
capabilities array is now an array of pointers to Capabaility. There
are extra indirections, but it rarely matters - we don't often access
Capabilities via the array, normally we already have a pointer to
one. I ran the parallel benchmarks and didn't see any difference.
Diffstat (limited to 'rts/RetainerProfile.c')
| -rw-r--r-- | rts/RetainerProfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c index dc21149d98..8cf88487f2 100644 --- a/rts/RetainerProfile.c +++ b/rts/RetainerProfile.c @@ -1789,7 +1789,7 @@ computeRetainerSet( void ) // because we can find MUT_VAR objects which have not been // visited during retainer profiling. for (n = 0; n < n_capabilities; n++) { - for (bd = capabilities[n].mut_lists[g]; bd != NULL; bd = bd->link) { + for (bd = capabilities[n]->mut_lists[g]; bd != NULL; bd = bd->link) { for (ml = bd->start; ml < bd->free; ml++) { maybeInitRetainerSet((StgClosure *)*ml); |