summaryrefslogtreecommitdiff
path: root/rts/Capability.h
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2014-10-07 10:30:36 +0100
committerSimon Marlow <marlowsd@gmail.com>2014-11-25 14:37:26 +0000
commite22bc0dedb9e9da0176ad7ce4a74acbefedc7207 (patch)
tree8a8872279576edf6824c25bf31accd793d970fd8 /rts/Capability.h
parente159e08a5e1c1f9f7b6805f3f0775333104c3d6e (diff)
downloadhaskell-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/Capability.h')
-rw-r--r--rts/Capability.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/rts/Capability.h b/rts/Capability.h
index 910c92c117..420bfd5c80 100644
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -98,6 +98,10 @@ struct Capability_ {
// reset after we have executed the context switch.
int interrupt;
+ // Total words allocated by this cap since rts start
+ // See [Note allocation accounting] in Storage.c
+ W_ total_allocated;
+
#if defined(THREADED_RTS)
// Worker Tasks waiting in the wings. Singly-linked.
Task *spare_workers;
@@ -131,8 +135,6 @@ struct Capability_ {
int io_manager_control_wr_fd;
#endif
#endif
- // Total words allocated by this cap since rts start
- W_ total_allocated;
// Per-capability STM-related data
StgTVarWatchQueue *free_tvar_watch_queues;