From: simonmar <unknown>
Date: Wed, 12 Oct 2005 12:56:30 +0000 (+0000)
Subject: [project @ 2005-10-12 12:56:30 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~178
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a3a331064b5020f77bf676a3d4eb74650ae7b8c3

[project @ 2005-10-12 12:56:30 by simonmar]
Fix assertion failure in memInventory() with SMP
---

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index dadcf1d..a1076eb 100644
--- 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) {