From 5a36a56294ccebb23e92efc8fded69fb4677e276 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 2 Aug 2005 14:59:39 +0000 Subject: [PATCH] [project @ 2005-08-02 14:59:39 by simonmar] small tidyup for memInventory --- ghc/rts/Storage.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c index f4e3bab..dadcf1d 100644 --- a/ghc/rts/Storage.c +++ b/ghc/rts/Storage.c @@ -950,6 +950,7 @@ stepBlocks (step *stp) bdescr *bd; total_blocks = stp->n_blocks; + total_blocks += stp->n_old_blocks; for (bd = stp->large_objects; bd; bd = bd->link) { total_blocks += bd->blocks; /* hack for megablock groups: they have an extra block or two in @@ -989,11 +990,6 @@ memInventory(void) total_blocks += stepBlocks(&nurseries[i]); } - if (RtsFlags.GcFlags.generations == 1) { - /* two-space collector has a to-space too :-) */ - total_blocks += g0s0->n_old_blocks; - } - /* any blocks held by allocate() */ for (bd = small_alloc_list; bd; bd = bd->link) { total_blocks += bd->blocks; -- 1.7.10.4