X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FGC.c;h=acb122fad6d336e34a37be9808f77428816aab58;hb=0d5d32bf62c39c390934d9ef4b01e2bf2db910f8;hp=b32274f235e462f9206ccce8edcd8245ca6d7ddb;hpb=34533246b5686e1948e6a014a6e2dc72befe94c7;p=ghc-hetmet.git diff --git a/ghc/rts/GC.c b/ghc/rts/GC.c index b32274f..acb122f 100644 --- a/ghc/rts/GC.c +++ b/ghc/rts/GC.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: GC.c,v 1.60 1999/06/29 13:04:38 panne Exp $ + * $Id: GC.c,v 1.72 2000/01/22 18:00:03 simonmar Exp $ * * (c) The GHC Team 1998-1999 * @@ -7,6 +7,25 @@ * * ---------------------------------------------------------------------------*/ +//@menu +//* Includes:: +//* STATIC OBJECT LIST:: +//* Static function declarations:: +//* Garbage Collect:: +//* Weak Pointers:: +//* Evacuation:: +//* Scavenging:: +//* Reverting CAFs:: +//* Sanity code for CAF garbage collection:: +//* Lazy black holing:: +//* Stack squeezing:: +//* Pausing a thread:: +//* Index:: +//@end menu + +//@node Includes, STATIC OBJECT LIST +//@subsection Includes + #include "Rts.h" #include "RtsFlags.h" #include "RtsUtils.h" @@ -19,13 +38,25 @@ #include "GC.h" #include "BlockAlloc.h" #include "Main.h" -#include "DebugProf.h" +#include "ProfHeap.h" #include "SchedAPI.h" #include "Weak.h" #include "StablePriv.h" +#if defined(GRAN) || defined(PAR) +# include "GranSimRts.h" +# include "ParallelRts.h" +# include "FetchMe.h" +# if defined(DEBUG) +# include "Printer.h" +# include "ParallelDebug.h" +# endif +#endif StgCAF* enteredCAFs; +//@node STATIC OBJECT LIST, Static function declarations, Includes +//@subsection STATIC OBJECT LIST + /* STATIC OBJECT LIST. * * During GC: @@ -96,6 +127,9 @@ bdescr *old_to_space; lnat new_blocks; /* blocks allocated during this GC */ lnat g0s0_pcnt_kept = 30; /* percentage of g0s0 live at last minor GC */ +//@node Static function declarations, Garbage Collect, STATIC OBJECT LIST +//@subsection Static function declarations + /* ----------------------------------------------------------------------------- Static function declarations -------------------------------------------------------------------------- */ @@ -119,6 +153,9 @@ static void scavenge_mut_once_list ( generation *g ); static void gcCAFs ( void ); #endif +//@node Garbage Collect, Weak Pointers, Static function declarations +//@subsection Garbage Collect + /* ----------------------------------------------------------------------------- GarbageCollect @@ -141,6 +178,7 @@ static void gcCAFs ( void ); - free from-space in each step, and set from-space = to-space. -------------------------------------------------------------------------- */ +//@cindex GarbageCollect void GarbageCollect(void (*get_roots)(void)) { @@ -153,6 +191,11 @@ void GarbageCollect(void (*get_roots)(void)) CostCentreStack *prev_CCS; #endif +#if defined(DEBUG) && defined(GRAN) + IF_DEBUG(gc, belch("@@ Starting garbage collection at %ld (%lx)\n", + Now, Now)) +#endif + /* tell the stats department that we've started a GC */ stat_startGC(); @@ -162,25 +205,8 @@ void GarbageCollect(void (*get_roots)(void)) CCCS = CCS_GC; #endif - /* We might have been called from Haskell land by _ccall_GC, in - * which case we need to call threadPaused() because the scheduler - * won't have done it. - */ - if (CurrentTSO) { threadPaused(CurrentTSO); } - - /* Approximate how much we allocated: number of blocks in the - * nursery + blocks allocated via allocate() - unused nusery blocks. - * This leaves a little slop at the end of each block, and doesn't - * take into account large objects (ToDo). - */ - allocated = (nursery_blocks * BLOCK_SIZE_W) + allocated_bytes(); - for ( bd = current_nursery->link; bd != NULL; bd = bd->link ) { - allocated -= BLOCK_SIZE_W; - } - if (current_nursery->free < current_nursery->start + BLOCK_SIZE_W) { - allocated -= (current_nursery->start + BLOCK_SIZE_W) - - current_nursery->free; - } + /* Approximate how much we allocated */ + allocated = calcAllocated(); /* Figure out which generation to collect */ @@ -193,8 +219,10 @@ void GarbageCollect(void (*get_roots)(void)) major_gc = (N == RtsFlags.GcFlags.generations-1); /* check stack sanity *before* GC (ToDo: check all threads) */ - /*IF_DEBUG(sanity, checkTSO(MainTSO,0)); */ - IF_DEBUG(sanity, checkFreeListSanity()); +#if defined(GRAN) + // ToDo!: check sanity IF_DEBUG(sanity, checkTSOsSanity()); +#endif + IF_DEBUG(sanity, checkFreeListSanity()); /* Initialise the static object lists */ @@ -313,6 +341,8 @@ void GarbageCollect(void (*get_roots)(void)) /* Do the mut-once lists first */ for (g = RtsFlags.GcFlags.generations-1; g > N; g--) { + IF_PAR_DEBUG(verbose, + printMutOnceList(&generations[g])); scavenge_mut_once_list(&generations[g]); evac_gen = g; for (st = generations[g].n_steps-1; st >= 0; st--) { @@ -321,6 +351,8 @@ void GarbageCollect(void (*get_roots)(void)) } for (g = RtsFlags.GcFlags.generations-1; g > N; g--) { + IF_PAR_DEBUG(verbose, + printMutableList(&generations[g])); scavenge_mutable_list(&generations[g]); evac_gen = g; for (st = generations[g].n_steps-1; st >= 0; st--) { @@ -334,11 +366,18 @@ void GarbageCollect(void (*get_roots)(void)) evac_gen = 0; get_roots(); +#if defined(PAR) /* And don't forget to mark the TSO if we got here direct from * Haskell! */ + /* Not needed in a seq version? if (CurrentTSO) { CurrentTSO = (StgTSO *)MarkRoot((StgClosure *)CurrentTSO); } + */ + + /* Mark the entries in the GALA table of the parallel system */ + markLocalGAs(major_gc); +#endif /* Mark the weak pointer list, and prepare to detect dead weak * pointers. @@ -600,7 +639,7 @@ void GarbageCollect(void (*get_roots)(void)) int pc_free; adjusted_blocks = (RtsFlags.GcFlags.maxHeapSize - 2 * blocks); - IF_DEBUG(gc, fprintf(stderr, "Near maximum heap size of 0x%x blocks, blocks = %d, adjusted to %d\n", RtsFlags.GcFlags.maxHeapSize, blocks, adjusted_blocks)); + IF_DEBUG(gc, fprintf(stderr, "@@ Near maximum heap size of 0x%x blocks, blocks = %d, adjusted to %d\n", RtsFlags.GcFlags.maxHeapSize, blocks, adjusted_blocks)); pc_free = adjusted_blocks * 100 / RtsFlags.GcFlags.maxHeapSize; if (pc_free < RtsFlags.GcFlags.pcFreeHeap) /* might even be < 0 */ { heapOverflow(); @@ -669,13 +708,12 @@ void GarbageCollect(void (*get_roots)(void)) /* Reset the nursery */ - for (bd = g0s0->blocks; bd; bd = bd->link) { - bd->free = bd->start; - ASSERT(bd->gen == g0); - ASSERT(bd->step == g0s0); - IF_DEBUG(sanity,memset(bd->start, 0xaa, BLOCK_SIZE)); - } - current_nursery = g0s0->blocks; + resetNurseries(); + +#if defined(PAR) + /* Reconstruct the Global Address tables used in GUM */ + RebuildGAtables(major_gc); +#endif /* start any pending finalizers */ scheduleFinalizers(old_weak_ptr_list); @@ -693,6 +731,7 @@ void GarbageCollect(void (*get_roots)(void)) /* restore enclosing cost centre */ #ifdef PROFILING + heapCensus(); CCCS = prev_CCS; #endif @@ -703,6 +742,9 @@ void GarbageCollect(void (*get_roots)(void)) stat_endGC(allocated, collected, live, copied, N); } +//@node Weak Pointers, Evacuation, Garbage Collect +//@subsection Weak Pointers + /* ----------------------------------------------------------------------------- Weak Pointers @@ -722,6 +764,7 @@ void GarbageCollect(void (*get_roots)(void)) probably be optimised by keeping per-generation lists of weak pointers, but for a few weak pointers this scheme will work. -------------------------------------------------------------------------- */ +//@cindex traverse_weak_ptr_list static rtsBool traverse_weak_ptr_list(void) @@ -810,6 +853,8 @@ traverse_weak_ptr_list(void) evacuated need to be evacuated now. -------------------------------------------------------------------------- */ +//@cindex cleanup_weak_ptr_list + static void cleanup_weak_ptr_list ( StgWeak **list ) { @@ -837,6 +882,8 @@ cleanup_weak_ptr_list ( StgWeak **list ) closure if it is alive, or NULL otherwise. -------------------------------------------------------------------------- */ +//@cindex isAlive + StgClosure * isAlive(StgClosure *p) { @@ -851,10 +898,14 @@ isAlive(StgClosure *p) * for static closures with an empty SRT or CONSTR_STATIC_NOCAFs. */ +#if 1 || !defined(PAR) /* ignore closures in generations that we're not collecting. */ + /* In GUM we use this routine when rebuilding GA tables; for some + reason it has problems with the LOOKS_LIKE_STATIC macro -- HWL */ if (LOOKS_LIKE_STATIC(p) || Bdescr((P_)p)->gen->no > N) { return p; } +#endif switch (info->type) { @@ -878,12 +929,14 @@ isAlive(StgClosure *p) } } +//@cindex MarkRoot StgClosure * MarkRoot(StgClosure *root) { return evacuate(root); } +//@cindex addBlock static void addBlock(step *step) { bdescr *bd = allocBlock(); @@ -905,6 +958,8 @@ static void addBlock(step *step) new_blocks++; } +//@cindex upd_evacuee + static __inline__ void upd_evacuee(StgClosure *p, StgClosure *dest) { @@ -912,6 +967,8 @@ upd_evacuee(StgClosure *p, StgClosure *dest) ((StgEvacuated *)p)->evacuee = dest; } +//@cindex copy + static __inline__ StgClosure * copy(StgClosure *src, nat size, step *step) { @@ -953,6 +1010,8 @@ copy(StgClosure *src, nat size, step *step) * used to optimise evacuation of BLACKHOLEs. */ +//@cindex copyPart + static __inline__ StgClosure * copyPart(StgClosure *src, nat size_to_reserve, nat size_to_copy, step *step) { @@ -981,6 +1040,9 @@ copyPart(StgClosure *src, nat size_to_reserve, nat size_to_copy, step *step) return (StgClosure *)dest; } +//@node Evacuation, Scavenging, Weak Pointers +//@subsection Evacuation + /* ----------------------------------------------------------------------------- Evacuate a large object @@ -992,6 +1054,8 @@ copyPart(StgClosure *src, nat size_to_reserve, nat size_to_copy, step *step) evacuated, or 0 otherwise. -------------------------------------------------------------------------- */ +//@cindex evacuate_large + static inline void evacuate_large(StgPtr p, rtsBool mutable) { @@ -1054,6 +1118,8 @@ evacuate_large(StgPtr p, rtsBool mutable) the promotion until the next GC. -------------------------------------------------------------------------- */ +//@cindex mkMutCons + static StgClosure * mkMutCons(StgClosure *ptr, generation *gen) { @@ -1103,7 +1169,7 @@ mkMutCons(StgClosure *ptr, generation *gen) didn't manage to evacuate this object into evac_gen. -------------------------------------------------------------------------- */ - +//@cindex evacuate static StgClosure * evacuate(StgClosure *q) @@ -1138,11 +1204,30 @@ loop: ASSERT(q && (LOOKS_LIKE_GHC_INFO(GET_INFO(q)) || IS_HUGS_CONSTR_INFO(GET_INFO(q)))); info = get_itbl(q); - + /* + if (info->type==RBH) { + info = REVERT_INFOPTR(info); + IF_DEBUG(gc, + belch("@_ Trying to evacuate an RBH %p (%s); reverting to IP %p (%s)", + q, info_type(q), info, info_type_by_ip(info))); + } + */ + switch (info -> type) { case BCO: - return copy(q,bco_sizeW(stgCast(StgBCO*,q)),step); + { + nat size = bco_sizeW((StgBCO*)q); + + if (size >= LARGE_OBJECT_THRESHOLD/sizeof(W_)) { + evacuate_large((P_)q, rtsFalse); + to = q; + } else { + /* just copy the block */ + to = copy(q,size,step); + } + return to; + } case MUT_VAR: ASSERT(q->header.info != &MUT_CONS_info); @@ -1345,7 +1430,7 @@ loop: case CATCH_FRAME: case SEQ_FRAME: /* shouldn't see these */ - barf("evacuate: stack frame\n"); + barf("evacuate: stack frame at %p\n", q); case AP_UPD: case PAP: @@ -1364,7 +1449,7 @@ loop: if (evac_gen > 0) { /* optimisation */ StgClosure *p = ((StgEvacuated*)q)->evacuee; if (Bdescr((P_)p)->gen->no < evac_gen) { - /* fprintf(stderr,"evac failed!\n");*/ + IF_DEBUG(gc, belch("@@ evacuate: evac of EVACUATED node %p failed!", p)); failed_to_evac = rtsTrue; TICK_GC_FAILED_PROMOTION(); } @@ -1404,10 +1489,17 @@ loop: case TSO: { - StgTSO *tso = stgCast(StgTSO *,q); + StgTSO *tso = (StgTSO *)q; nat size = tso_sizeW(tso); int diff; + /* Deal with redirected TSOs (a TSO that's had its stack enlarged). + */ + if (tso->whatNext == ThreadRelocated) { + q = (StgClosure *)tso->link; + goto loop; + } + /* Large TSOs don't get moved, so no relocation is required. */ if (size >= LARGE_OBJECT_THRESHOLD/sizeof(W_)) { @@ -1434,10 +1526,44 @@ loop: } } +#if defined(PAR) + case RBH: // cf. BLACKHOLE_BQ + { + //StgInfoTable *rip = get_closure_info(q, &size, &ptrs, &nonptrs, &vhs, str); + to = copy(q,BLACKHOLE_sizeW(),step); + //ToDo: derive size etc from reverted IP + //to = copy(q,size,step); + recordMutable((StgMutClosure *)to); + IF_DEBUG(gc, + belch("@@ evacuate: RBH %p (%s) to %p (%s)", + q, info_type(q), to, info_type(to))); + return to; + } + case BLOCKED_FETCH: + ASSERT(sizeofW(StgBlockedFetch) >= MIN_NONUPD_SIZE); + to = copy(q,sizeofW(StgBlockedFetch),step); + IF_DEBUG(gc, + belch("@@ evacuate: %p (%s) to %p (%s)", + q, info_type(q), to, info_type(to))); + return to; + case FETCH_ME: - fprintf(stderr,"evacuate: unimplemented/strange closure type\n"); - return q; + ASSERT(sizeofW(StgBlockedFetch) >= MIN_UPD_SIZE); + to = copy(q,sizeofW(StgFetchMe),step); + IF_DEBUG(gc, + belch("@@ evacuate: %p (%s) to %p (%s)", + q, info_type(q), to, info_type(to))); + return to; + + case FETCH_ME_BQ: + ASSERT(sizeofW(StgBlockedFetch) >= MIN_UPD_SIZE); + to = copy(q,sizeofW(StgFetchMeBlockingQueue),step); + IF_DEBUG(gc, + belch("@@ evacuate: %p (%s) to %p (%s)", + q, info_type(q), to, info_type(to))); + return to; +#endif default: barf("evacuate: strange closure type %d", (int)(info->type)); @@ -1450,6 +1576,7 @@ loop: relocate_TSO is called just after a TSO has been copied from src to dest. It adjusts the update frame list for the new location. -------------------------------------------------------------------------- */ +//@cindex relocate_TSO StgTSO * relocate_TSO(StgTSO *src, StgTSO *dest) @@ -1498,6 +1625,11 @@ relocate_TSO(StgTSO *src, StgTSO *dest) return dest; } +//@node Scavenging, Reverting CAFs, Evacuation +//@subsection Scavenging + +//@cindex scavenge_srt + static inline void scavenge_srt(const StgInfoTable *info) { @@ -1532,6 +1664,28 @@ scavenge_srt(const StgInfoTable *info) } /* ----------------------------------------------------------------------------- + Scavenge a TSO. + -------------------------------------------------------------------------- */ + +static void +scavengeTSO (StgTSO *tso) +{ + /* chase the link field for any TSOs on the same queue */ + (StgClosure *)tso->link = evacuate((StgClosure *)tso->link); + if ( tso->why_blocked == BlockedOnMVar + || tso->why_blocked == BlockedOnBlackHole + || tso->why_blocked == BlockedOnException) { + tso->block_info.closure = evacuate(tso->block_info.closure); + } + if ( tso->blocked_exceptions != NULL ) { + tso->blocked_exceptions = + (StgTSO *)evacuate((StgClosure *)tso->blocked_exceptions); + } + /* scavenge this thread's stack */ + scavenge_stack(tso->sp, &(tso->stack[tso->stack_size])); +} + +/* ----------------------------------------------------------------------------- Scavenge a given step until there are no more objects in this step to scavenge. @@ -1543,7 +1697,7 @@ scavenge_srt(const StgInfoTable *info) scavenging a mutable object where early promotion isn't such a good idea. -------------------------------------------------------------------------- */ - +//@cindex scavenge static void scavenge(step *step) @@ -1577,6 +1731,11 @@ scavenge(step *step) || IS_HUGS_CONSTR_INFO(GET_INFO((StgClosure *)p)))); info = get_itbl((StgClosure *)p); + /* + if (info->type==RBH) + info = REVERT_INFOPTR(info); + */ + switch (info -> type) { case BCO: @@ -1836,24 +1995,80 @@ scavenge(step *step) case TSO: { - StgTSO *tso; - - tso = (StgTSO *)p; + StgTSO *tso = (StgTSO *)p; evac_gen = 0; - /* chase the link field for any TSOs on the same queue */ - (StgClosure *)tso->link = evacuate((StgClosure *)tso->link); - if (tso->blocked_on) { - tso->blocked_on = evacuate(tso->blocked_on); - } - /* scavenge this thread's stack */ - scavenge_stack(tso->sp, &(tso->stack[tso->stack_size])); + scavengeTSO(tso); evac_gen = saved_evac_gen; p += tso_sizeW(tso); break; } +#if defined(PAR) + case RBH: // cf. BLACKHOLE_BQ + { + // nat size, ptrs, nonptrs, vhs; + // char str[80]; + // StgInfoTable *rip = get_closure_info(p, &size, &ptrs, &nonptrs, &vhs, str); + StgRBH *rbh = (StgRBH *)p; + (StgClosure *)rbh->blocking_queue = + evacuate((StgClosure *)rbh->blocking_queue); + if (failed_to_evac) { + failed_to_evac = rtsFalse; + recordMutable((StgMutClosure *)rbh); + } + IF_DEBUG(gc, + belch("@@ scavenge: RBH %p (%s) (new blocking_queue link=%p)", + p, info_type(p), (StgClosure *)rbh->blocking_queue)); + // ToDo: use size of reverted closure here! + p += BLACKHOLE_sizeW(); + break; + } + case BLOCKED_FETCH: + { + StgBlockedFetch *bf = (StgBlockedFetch *)p; + /* follow the pointer to the node which is being demanded */ + (StgClosure *)bf->node = + evacuate((StgClosure *)bf->node); + /* follow the link to the rest of the blocking queue */ + (StgClosure *)bf->link = + evacuate((StgClosure *)bf->link); + if (failed_to_evac) { + failed_to_evac = rtsFalse; + recordMutable((StgMutClosure *)bf); + } + IF_DEBUG(gc, + belch("@@ scavenge: %p (%s); node is now %p; exciting, isn't it", + bf, info_type((StgClosure *)bf), + bf->node, info_type(bf->node))); + p += sizeofW(StgBlockedFetch); + break; + } + case FETCH_ME: + IF_DEBUG(gc, + belch("@@ scavenge: HWL claims nothing to do for %p (%s)", + p, info_type((StgClosure *)p))); + p += sizeofW(StgFetchMe); + break; // nothing to do in this case + + case FETCH_ME_BQ: // cf. BLACKHOLE_BQ + { + StgFetchMeBlockingQueue *fmbq = (StgFetchMeBlockingQueue *)p; + (StgClosure *)fmbq->blocking_queue = + evacuate((StgClosure *)fmbq->blocking_queue); + if (failed_to_evac) { + failed_to_evac = rtsFalse; + recordMutable((StgMutClosure *)fmbq); + } + IF_DEBUG(gc, + belch("@@ scavenge: %p (%s) exciting, isn't it", + p, info_type((StgClosure *)p))); + p += sizeofW(StgFetchMeBlockingQueue); + break; + } +#endif + case EVACUATED: barf("scavenge: unimplemented/strange closure type\n"); @@ -1882,6 +2097,8 @@ scavenge(step *step) because they contain old-to-new generation pointers. Only certain objects can have this property. -------------------------------------------------------------------------- */ +//@cindex scavenge_one + static rtsBool scavenge_one(StgClosure *p) { @@ -1893,6 +2110,11 @@ scavenge_one(StgClosure *p) info = get_itbl(p); + /* ngoq moHqu'! + if (info->type==RBH) + info = REVERT_INFOPTR(info); // if it's an RBH, look at the orig closure + */ + switch (info -> type) { case FUN: @@ -1979,6 +2201,7 @@ scavenge_one(StgClosure *p) generations older than the one being collected) as roots. We also remove non-mutable objects from the mutable list at this point. -------------------------------------------------------------------------- */ +//@cindex scavenge_mut_once_list static void scavenge_mut_once_list(generation *gen) @@ -2000,6 +2223,10 @@ scavenge_mut_once_list(generation *gen) || IS_HUGS_CONSTR_INFO(GET_INFO(p)))); info = get_itbl(p); + /* + if (info->type==RBH) + info = REVERT_INFOPTR(info); // if it's an RBH, look at the orig closure + */ switch(info->type) { case IND_OLDGEN: @@ -2011,7 +2238,8 @@ scavenge_mut_once_list(generation *gen) ((StgIndOldGen *)p)->indirectee = evacuate(((StgIndOldGen *)p)->indirectee); -#if 0 +#ifdef DEBUG + if (RtsFlags.DebugFlags.gc) /* Debugging code to print out the size of the thing we just * promoted */ @@ -2110,6 +2338,7 @@ scavenge_mut_once_list(generation *gen) gen->mut_once_list = new_list; } +//@cindex scavenge_mutable_list static void scavenge_mutable_list(generation *gen) @@ -2130,6 +2359,10 @@ scavenge_mutable_list(generation *gen) || IS_HUGS_CONSTR_INFO(GET_INFO(p)))); info = get_itbl(p); + /* + if (info->type==RBH) + info = REVERT_INFOPTR(info); // if it's an RBH, look at the orig closure + */ switch(info->type) { case MUT_ARR_PTRS_FROZEN: @@ -2139,6 +2372,10 @@ scavenge_mutable_list(generation *gen) { StgPtr end, q; + IF_DEBUG(gc, + belch("@@ scavenge_mut_list: scavenging MUT_ARR_PTRS_FROZEN %p; size: %#x ; next: %p", + p, mut_arr_ptrs_sizeW((StgMutArrPtrs*)p), p->mut_link)); + end = (P_)p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p); evac_gen = gen->no; for (q = (P_)((StgMutArrPtrs *)p)->payload; q < end; q++) { @@ -2161,6 +2398,10 @@ scavenge_mutable_list(generation *gen) { StgPtr end, q; + IF_DEBUG(gc, + belch("@@ scavenge_mut_list: scavenging MUT_ARR_PTRS %p; size: %#x ; next: %p", + p, mut_arr_ptrs_sizeW((StgMutArrPtrs*)p), p->mut_link)); + end = (P_)p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p); for (q = (P_)((StgMutArrPtrs *)p)->payload; q < end; q++) { (StgClosure *)*q = evacuate((StgClosure *)*q); @@ -2173,6 +2414,10 @@ scavenge_mutable_list(generation *gen) * it from the mutable list if possible by promoting whatever it * points to. */ + IF_DEBUG(gc, + belch("@@ scavenge_mut_list: scavenging MUT_VAR %p; var: %p ; next: %p", + p, ((StgMutVar *)p)->var, p->mut_link)); + ASSERT(p->header.info != &MUT_CONS_info); ((StgMutVar *)p)->var = evacuate(((StgMutVar *)p)->var); p->mut_link = gen->mut_list; @@ -2182,6 +2427,11 @@ scavenge_mutable_list(generation *gen) case MVAR: { StgMVar *mvar = (StgMVar *)p; + + IF_DEBUG(gc, + belch("@@ scavenge_mut_list: scavenging MAVR %p; head: %p; tail: %p; value: %p ; next: %p", + mvar, mvar->head, mvar->tail, mvar->value, p->mut_link)); + (StgClosure *)mvar->head = evacuate((StgClosure *)mvar->head); (StgClosure *)mvar->tail = evacuate((StgClosure *)mvar->tail); (StgClosure *)mvar->value = evacuate((StgClosure *)mvar->value); @@ -2194,11 +2444,7 @@ scavenge_mutable_list(generation *gen) { StgTSO *tso = (StgTSO *)p; - (StgClosure *)tso->link = evacuate((StgClosure *)tso->link); - if (tso->blocked_on) { - tso->blocked_on = evacuate(tso->blocked_on); - } - scavenge_stack(tso->sp, &(tso->stack[tso->stack_size])); + scavengeTSO(tso); /* Don't take this TSO off the mutable list - it might still * point to some younger objects (because we set evac_gen to 0 @@ -2212,6 +2458,11 @@ scavenge_mutable_list(generation *gen) case BLACKHOLE_BQ: { StgBlockingQueue *bh = (StgBlockingQueue *)p; + + IF_DEBUG(gc, + belch("@@ scavenge_mut_list: scavenging BLACKHOLE_BQ (%p); next: %p", + p, p->mut_link)); + (StgClosure *)bh->blocking_queue = evacuate((StgClosure *)bh->blocking_queue); p->mut_link = gen->mut_list; @@ -2219,13 +2470,38 @@ scavenge_mutable_list(generation *gen) continue; } + /* Happens if a BLACKHOLE_BQ in the old generation is updated: + */ + case IND_OLDGEN: + case IND_OLDGEN_PERM: + /* Try to pull the indirectee into this generation, so we can + * remove the indirection from the mutable list. + */ + evac_gen = gen->no; + ((StgIndOldGen *)p)->indirectee = + evacuate(((StgIndOldGen *)p)->indirectee); + evac_gen = 0; + + if (failed_to_evac) { + failed_to_evac = rtsFalse; + p->mut_link = gen->mut_once_list; + gen->mut_once_list = p; + } else { + p->mut_link = NULL; + } + continue; + + // HWL: old PAR code deleted here + default: /* shouldn't have anything else on the mutables list */ - barf("scavenge_mut_list: strange object? %d", (int)(info->type)); + barf("scavenge_mutable_list: strange object? %d", (int)(info->type)); } } } +//@cindex scavenge_static + static void scavenge_static(void) { @@ -2241,7 +2517,10 @@ scavenge_static(void) while (p != END_OF_STATIC_LIST) { info = get_itbl(p); - + /* + if (info->type==RBH) + info = REVERT_INFOPTR(info); // if it's an RBH, look at the orig closure + */ /* make sure the info pointer is into text space */ ASSERT(p && (LOOKS_LIKE_GHC_INFO(GET_INFO(p)) || IS_HUGS_CONSTR_INFO(GET_INFO(p)))); @@ -2310,6 +2589,7 @@ scavenge_static(void) objects pointed to by it. We can use the same code for walking PAPs, since these are just sections of copied stack. -------------------------------------------------------------------------- */ +//@cindex scavenge_stack static void scavenge_stack(StgPtr p, StgPtr stack_end) @@ -2318,6 +2598,8 @@ scavenge_stack(StgPtr p, StgPtr stack_end) const StgInfoTable* info; StgWord32 bitmap; + IF_DEBUG(sanity, belch(" scavenging stack between %p and %p", p, stack_end)); + /* * Each time around this loop, we are looking at a chunk of stack * that starts with either a pending argument section or an @@ -2366,8 +2648,18 @@ scavenge_stack(StgPtr p, StgPtr stack_end) /* probably a slow-entry point return address: */ case FUN: case FUN_STATIC: - p++; + { +#if 0 + StgPtr old_p = p; + p++; p++; + IF_DEBUG(sanity, + belch("HWL: scavenge_stack: FUN(_STATIC) adjusting p from %p to %p (instead of %p)", + old_p, p, old_p+1)); +#else + p++; /* what if FHS!=1 !? -- HWL */ +#endif goto follow_srt; + } /* Specialised code for update frames, since they're so common. * We *know* the updatee points to a BLACKHOLE, CAF_BLACKHOLE, @@ -2422,14 +2714,27 @@ scavenge_stack(StgPtr p, StgPtr stack_end) } /* small bitmap (< 32 entries, or 64 on a 64-bit machine) */ - case RET_BCO: - case RET_SMALL: - case RET_VEC_SMALL: case STOP_FRAME: case CATCH_FRAME: case SEQ_FRAME: + { + // StgPtr old_p = p; // debugging only -- HWL + /* stack frames like these are ordinary closures and therefore may + contain setup-specific fixed-header words (as in GranSim!); + therefore, these cases should not use p++ but &(p->payload) -- HWL */ + // IF_DEBUG(gran, IF_DEBUG(sanity, printObj(p))); + bitmap = info->layout.bitmap; + + p = (StgPtr)&(((StgClosure *)p)->payload); + // IF_DEBUG(sanity, belch("HWL: scavenge_stack: (STOP|CATCH|SEQ)_FRAME adjusting p from %p to %p (instead of %p)", old_p, p, old_p+1)); + goto small_bitmap; + } + case RET_BCO: + case RET_SMALL: + case RET_VEC_SMALL: bitmap = info->layout.bitmap; p++; + /* this assumes that the payload starts immediately after the info-ptr */ small_bitmap: while (bitmap != 0) { if ((bitmap & 1) == 0) { @@ -2490,6 +2795,7 @@ scavenge_stack(StgPtr p, StgPtr stack_end) objects are (repeatedly) mutable, so most of the time evac_gen will be zero. --------------------------------------------------------------------------- */ +//@cindex scavenge_large static void scavenge_large(step *step) @@ -2565,19 +2871,9 @@ scavenge_large(step *step) } case TSO: - { - StgTSO *tso; - - tso = (StgTSO *)p; - /* chase the link field for any TSOs on the same queue */ - (StgClosure *)tso->link = evacuate((StgClosure *)tso->link); - if (tso->blocked_on) { - tso->blocked_on = evacuate(tso->blocked_on); - } - /* scavenge this thread's stack */ - scavenge_stack(tso->sp, &(tso->stack[tso->stack_size])); + scavengeTSO((StgTSO *)p); + // HWL: old PAR code deleted here continue; - } default: barf("scavenge_large: unknown/strange object"); @@ -2585,6 +2881,8 @@ scavenge_large(step *step) } } +//@cindex zero_static_object_list + static void zero_static_object_list(StgClosure* first_static) { @@ -2607,6 +2905,8 @@ zero_static_object_list(StgClosure* first_static) * It doesn't do any harm to zero all the mutable link fields on the * mutable list. */ +//@cindex zero_mutable_list + static void zero_mutable_list( StgMutClosure *first ) { @@ -2618,9 +2918,13 @@ zero_mutable_list( StgMutClosure *first ) } } +//@node Reverting CAFs, Sanity code for CAF garbage collection, Scavenging +//@subsection Reverting CAFs + /* ----------------------------------------------------------------------------- Reverting CAFs -------------------------------------------------------------------------- */ +//@cindex RevertCAFs void RevertCAFs(void) { @@ -2636,6 +2940,8 @@ void RevertCAFs(void) enteredCAFs = END_CAF_LIST; } +//@cindex revert_dead_CAFs + void revert_dead_CAFs(void) { StgCAF* caf = enteredCAFs; @@ -2648,7 +2954,7 @@ void revert_dead_CAFs(void) new->link = enteredCAFs; enteredCAFs = new; } else { - ASSERT(0); + /* ASSERT(0); */ SET_INFO(caf,&CAF_UNENTERED_info); caf->value = (StgClosure*)0xdeadbeef; caf->link = (StgCAF*)0xdeadbeef; @@ -2657,6 +2963,9 @@ void revert_dead_CAFs(void) } } +//@node Sanity code for CAF garbage collection, Lazy black holing, Reverting CAFs +//@subsection Sanity code for CAF garbage collection + /* ----------------------------------------------------------------------------- Sanity code for CAF garbage collection. @@ -2670,6 +2979,8 @@ void revert_dead_CAFs(void) -------------------------------------------------------------------------- */ #ifdef DEBUG +//@cindex gcCAFs + static void gcCAFs(void) { @@ -2707,6 +3018,9 @@ gcCAFs(void) } #endif +//@node Lazy black holing, Stack squeezing, Sanity code for CAF garbage collection +//@subsection Lazy black holing + /* ----------------------------------------------------------------------------- Lazy black holing. @@ -2714,6 +3028,7 @@ gcCAFs(void) some work, we have to run down the stack and black-hole all the closures referred to by update frames. -------------------------------------------------------------------------- */ +//@cindex threadLazyBlackHole static void threadLazyBlackHole(StgTSO *tso) @@ -2769,6 +3084,9 @@ threadLazyBlackHole(StgTSO *tso) } } +//@node Stack squeezing, Pausing a thread, Lazy black holing +//@subsection Stack squeezing + /* ----------------------------------------------------------------------------- * Stack squeezing * @@ -2776,6 +3094,7 @@ threadLazyBlackHole(StgTSO *tso) * lazy black holing here. * * -------------------------------------------------------------------------- */ +//@cindex threadSqueezeStack static void threadSqueezeStack(StgTSO *tso) @@ -2786,6 +3105,14 @@ threadSqueezeStack(StgTSO *tso) StgUpdateFrame *prev_frame; /* Temporally previous */ StgPtr bottom; rtsBool prev_was_update_frame; +#if DEBUG + StgUpdateFrame *top_frame; + nat upd_frames=0, stop_frames=0, catch_frames=0, seq_frames=0, + bhs=0, squeezes=0; + void printObj( StgClosure *obj ); // from Printer.c + + top_frame = tso->su; +#endif bottom = &(tso->stack[tso->stack_size]); frame = tso->su; @@ -2811,6 +3138,30 @@ threadSqueezeStack(StgTSO *tso) frame->link = next_frame; next_frame = frame; frame = prev_frame; +#if DEBUG + IF_DEBUG(sanity, + if (!(frame>=top_frame && frame<=(StgUpdateFrame *)bottom)) { + printObj((StgClosure *)prev_frame); + barf("threadSqueezeStack: current frame is rubbish %p; previous was %p\n", + frame, prev_frame); + }) + switch (get_itbl(frame)->type) { + case UPDATE_FRAME: upd_frames++; + if (frame->updatee->header.info == &BLACKHOLE_info) + bhs++; + break; + case STOP_FRAME: stop_frames++; + break; + case CATCH_FRAME: catch_frames++; + break; + case SEQ_FRAME: seq_frames++; + break; + default: + barf("Found non-frame during stack squeezing at %p (prev frame was %p)\n", + frame, prev_frame); + printObj((StgClosure *)prev_frame); + } +#endif if (get_itbl(frame)->type == UPDATE_FRAME && frame->updatee->header.info == &BLACKHOLE_info) { break; @@ -2860,8 +3211,9 @@ threadSqueezeStack(StgTSO *tso) StgClosure *updatee_keep = prev_frame->updatee; StgClosure *updatee_bypass = frame->updatee; -#if 0 /* DEBUG */ - fprintf(stderr, "squeezing frame at %p\n", frame); +#if DEBUG + IF_DEBUG(gc, fprintf(stderr, "@@ squeezing frame at %p\n", frame)); + squeezes++; #endif /* Deal with blocking queues. If both updatees have blocked @@ -2904,10 +3256,11 @@ threadSqueezeStack(StgTSO *tso) #endif TICK_UPD_SQUEEZED(); - /* wasn't there something about update squeezing and ticky to be sorted out? - * oh yes: we aren't counting each enter properly in this case. See the log somewhere. - * KSW 1999-04-21 */ - UPD_IND(updatee_bypass, updatee_keep); /* this wakes the threads up */ + /* wasn't there something about update squeezing and ticky to be + * sorted out? oh yes: we aren't counting each enter properly + * in this case. See the log somewhere. KSW 1999-04-21 + */ + UPD_IND_NOLOCK(updatee_bypass, updatee_keep); /* this wakes the threads up */ sp = (P_)frame - 1; /* sp = stuff to slide */ displacement += sizeofW(StgUpdateFrame); @@ -2920,7 +3273,8 @@ threadSqueezeStack(StgTSO *tso) */ if (is_update_frame) { StgBlockingQueue *bh = (StgBlockingQueue *)frame->updatee; - if (bh->header.info != &BLACKHOLE_BQ_info && + if (bh->header.info != &BLACKHOLE_info && + bh->header.info != &BLACKHOLE_BQ_info && bh->header.info != &CAF_BLACKHOLE_info) { #if (!defined(LAZY_BLACKHOLING)) && defined(DEBUG) fprintf(stderr,"Unexpected lazy BHing required at 0x%04x\n",(int)bh); @@ -2944,9 +3298,10 @@ threadSqueezeStack(StgTSO *tso) else next_frame_bottom = tso->sp - 1; -#if 0 /* DEBUG */ - fprintf(stderr, "sliding [%p, %p] by %ld\n", sp, next_frame_bottom, - displacement); +#if DEBUG + IF_DEBUG(gc, + fprintf(stderr, "sliding [%p, %p] by %ld\n", sp, next_frame_bottom, + displacement)) #endif while (sp >= next_frame_bottom) { @@ -2960,8 +3315,16 @@ threadSqueezeStack(StgTSO *tso) tso->sp += displacement; tso->su = prev_frame; +#if DEBUG + IF_DEBUG(gc, + fprintf(stderr, "@@ threadSqueezeStack: squeezed %d update-frames; found %d BHs; found %d update-, %d stop-, %d catch, %d seq-frames\n", + squeezes, bhs, upd_frames, stop_frames, catch_frames, seq_frames)) +#endif } +//@node Pausing a thread, Index, Stack squeezing +//@subsection Pausing a thread + /* ----------------------------------------------------------------------------- * Pausing a thread * @@ -2969,6 +3332,7 @@ threadSqueezeStack(StgTSO *tso) * here. We also take the opportunity to do stack squeezing if it's * turned on. * -------------------------------------------------------------------------- */ +//@cindex threadPaused void threadPaused(StgTSO *tso) @@ -2978,3 +3342,78 @@ threadPaused(StgTSO *tso) else threadLazyBlackHole(tso); } + +/* ----------------------------------------------------------------------------- + * Debugging + * -------------------------------------------------------------------------- */ + +#if DEBUG +//@cindex printMutOnceList +void +printMutOnceList(generation *gen) +{ + StgMutClosure *p, *next; + + p = gen->mut_once_list; + next = p->mut_link; + + fprintf(stderr, "@@ Mut once list %p: ", gen->mut_once_list); + for (; p != END_MUT_LIST; p = next, next = p->mut_link) { + fprintf(stderr, "%p (%s), ", + p, info_type((StgClosure *)p)); + } + fputc('\n', stderr); +} + +//@cindex printMutableList +void +printMutableList(generation *gen) +{ + StgMutClosure *p, *next; + + p = gen->saved_mut_list; + next = p->mut_link; + + fprintf(stderr, "@@ Mutable list %p: ", gen->saved_mut_list); + for (; p != END_MUT_LIST; p = next, next = p->mut_link) { + fprintf(stderr, "%p (%s), ", + p, info_type((StgClosure *)p)); + } + fputc('\n', stderr); +} +#endif /* DEBUG */ + +//@node Index, , Pausing a thread +//@subsection Index + +//@index +//* GarbageCollect:: @cindex\s-+GarbageCollect +//* MarkRoot:: @cindex\s-+MarkRoot +//* RevertCAFs:: @cindex\s-+RevertCAFs +//* addBlock:: @cindex\s-+addBlock +//* cleanup_weak_ptr_list:: @cindex\s-+cleanup_weak_ptr_list +//* copy:: @cindex\s-+copy +//* copyPart:: @cindex\s-+copyPart +//* evacuate:: @cindex\s-+evacuate +//* evacuate_large:: @cindex\s-+evacuate_large +//* gcCAFs:: @cindex\s-+gcCAFs +//* isAlive:: @cindex\s-+isAlive +//* mkMutCons:: @cindex\s-+mkMutCons +//* relocate_TSO:: @cindex\s-+relocate_TSO +//* revert_dead_CAFs:: @cindex\s-+revert_dead_CAFs +//* scavenge:: @cindex\s-+scavenge +//* scavenge_large:: @cindex\s-+scavenge_large +//* scavenge_mut_once_list:: @cindex\s-+scavenge_mut_once_list +//* scavenge_mutable_list:: @cindex\s-+scavenge_mutable_list +//* scavenge_one:: @cindex\s-+scavenge_one +//* scavenge_srt:: @cindex\s-+scavenge_srt +//* scavenge_stack:: @cindex\s-+scavenge_stack +//* scavenge_static:: @cindex\s-+scavenge_static +//* threadLazyBlackHole:: @cindex\s-+threadLazyBlackHole +//* threadPaused:: @cindex\s-+threadPaused +//* threadSqueezeStack:: @cindex\s-+threadSqueezeStack +//* traverse_weak_ptr_list:: @cindex\s-+traverse_weak_ptr_list +//* upd_evacuee:: @cindex\s-+upd_evacuee +//* zero_mutable_list:: @cindex\s-+zero_mutable_list +//* zero_static_object_list:: @cindex\s-+zero_static_object_list +//@end index