diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-10-07 10:30:36 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-11-25 14:37:26 +0000 |
| commit | e22bc0dedb9e9da0176ad7ce4a74acbefedc7207 (patch) | |
| tree | 8a8872279576edf6824c25bf31accd793d970fd8 /rts/HeapStackCheck.cmm | |
| parent | e159e08a5e1c1f9f7b6805f3f0775333104c3d6e (diff) | |
| download | haskell-e22bc0dedb9e9da0176ad7ce4a74acbefedc7207.tar.gz | |
Make clearNursery free
Summary:
clearNursery resets all the bd->free pointers of nursery blocks to
make the blocks empty. In profiles we've seen clearNursery taking
significant amounts of time particularly with large -N and -A values.
This patch moves the work of clearNursery to the point at which we
actually need the new block, thereby introducing an invariant that
blocks to the right of the CurrentNursery pointer still need their
bd->free pointer reset. This should make things faster overall,
because we don't need to clear blocks that we don't use.
Test Plan: validate
Reviewers: AndreasVoellmy, ezyang, austin
Subscribers: thomie, carter, ezyang, simonmar
Differential Revision: https://phabricator.haskell.org/D318
Diffstat (limited to 'rts/HeapStackCheck.cmm')
| -rw-r--r-- | rts/HeapStackCheck.cmm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index a1fb5d446d..a1e18ca0f0 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -97,7 +97,12 @@ stg_gc_noregs && bdescr_link(CurrentNursery) != NULL) { HpAlloc = 0; CLOSE_NURSERY(); + Capability_total_allocated(MyCapability()) = + Capability_total_allocated(MyCapability()) + + BYTES_TO_WDS(bdescr_free(CurrentNursery) - + bdescr_start(CurrentNursery)); CurrentNursery = bdescr_link(CurrentNursery); + bdescr_free(CurrentNursery) = bdescr_start(CurrentNursery); OPEN_NURSERY(); if (Capability_context_switch(MyCapability()) != 0 :: CInt || Capability_interrupt(MyCapability()) != 0 :: CInt || |