From 2109f5e292cca24ab8bfeee4d6aba375e9f3dc84 Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 7 Apr 2005 15:53:01 +0000 Subject: [PATCH] [project @ 2005-04-07 15:53:01 by simonmar] resetNurseries: tidy up --- ghc/rts/Storage.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c index 0e25b42..7957d73 100644 --- a/ghc/rts/Storage.c +++ b/ghc/rts/Storage.c @@ -368,13 +368,16 @@ void resetNurseries( void ) { bdescr *bd; -#ifdef SMP Capability *cap; - + +#ifdef SMP /* All tasks must be stopped */ ASSERT(rts_n_free_capabilities == RtsFlags.ParFlags.nNodes); - - for (cap = free_capabilities; cap != NULL; cap = cap->link) { + for (cap = free_capabilities; cap != NULL; cap = cap->link) +#else + cap = &MainCapability; +#endif + { for (bd = cap->r.rNursery; bd; bd = bd->link) { bd->free = bd->start; ASSERT(bd->gen_no == 0); @@ -383,16 +386,6 @@ resetNurseries( void ) } cap->r.rCurrentNursery = cap->r.rNursery; } -#else - for (bd = g0s0->blocks; bd; bd = bd->link) { - bd->free = bd->start; - ASSERT(bd->gen_no == 0); - ASSERT(bd->step == g0s0); - IF_DEBUG(sanity,memset(bd->start, 0xaa, BLOCK_SIZE)); - } - MainCapability.r.rNursery = g0s0->blocks; - MainCapability.r.rCurrentNursery = g0s0->blocks; -#endif } bdescr * -- 1.7.10.4