projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e10d63
)
[project @ 2005-10-12 12:56:30 by simonmar]
author
simonmar
<unknown>
Wed, 12 Oct 2005 12:56:30 +0000
(12:56 +0000)
committer
simonmar
<unknown>
Wed, 12 Oct 2005 12:56:30 +0000
(12:56 +0000)
Fix assertion failure in memInventory() with SMP
ghc/rts/Storage.c
patch
|
blob
|
history
diff --git
a/ghc/rts/Storage.c
b/ghc/rts/Storage.c
index
dadcf1d
..
a1076eb
100644
(file)
--- a/
ghc/rts/Storage.c
+++ b/
ghc/rts/Storage.c
@@
-989,6
+989,10
@@
memInventory(void)
for (i = 0; i < n_nurseries; i++) {
total_blocks += stepBlocks(&nurseries[i]);
}
+#ifdef SMP
+ // We put pinned object blocks in g0s0, so better count blocks there too.
+ total_blocks += stepBlocks(g0s0);
+#endif
/* any blocks held by allocate() */
for (bd = small_alloc_list; bd; bd = bd->link) {