/* -----------------------------------------------------------------------------
- * $Id: GC.c,v 1.20 1999/01/26 16:16:22 simonm Exp $
+ * $Id: GC.c,v 1.24 1999/02/05 14:45:42 simonm Exp $
*
* Two-space garbage collector
*
static void scavenge_large(step *step);
static void scavenge(step *step);
static void scavenge_static(void);
-static StgMutClosure *scavenge_mutable_list(StgMutClosure *p, nat gen);
+static void scavenge_mutable_list(generation *g);
+static void scavenge_mut_once_list(generation *g);
#ifdef DEBUG
static void gcCAFs(void);
* zeroMutableList below).
*/
if (major_gc) {
- zeroMutableList(generations[RtsFlags.GcFlags.generations-1].mut_list);
+ zeroMutableList(generations[RtsFlags.GcFlags.generations-1].mut_once_list);
}
/* Save the old to-space if we're doing a two-space collection
* collecting.
*/
for (g = 0; g <= N; g++) {
+ generations[g].mut_once_list = END_MUT_LIST;
generations[g].mut_list = END_MUT_LIST;
for (s = 0; s < generations[g].n_steps; s++) {
* it has already been evaced to gen 2.
*/
{
- StgMutClosure *tmp, **pp;
- for (g = N+1; g < RtsFlags.GcFlags.generations; g++) {
+ int st;
+ for (g = RtsFlags.GcFlags.generations-1; g > N; g--) {
generations[g].saved_mut_list = generations[g].mut_list;
generations[g].mut_list = END_MUT_LIST;
}
+ /* Do the mut-once lists first */
+ for (g = RtsFlags.GcFlags.generations-1; g > N; g--) {
+ scavenge_mut_once_list(&generations[g]);
+ evac_gen = g;
+ for (st = generations[g].n_steps-1; st >= 0; st--) {
+ scavenge(&generations[g].steps[st]);
+ }
+ }
+
for (g = RtsFlags.GcFlags.generations-1; g > N; g--) {
- tmp = scavenge_mutable_list(generations[g].saved_mut_list, g);
- pp = &generations[g].mut_list;
- while (*pp != END_MUT_LIST) {
- pp = &(*pp)->mut_link;
+ scavenge_mutable_list(&generations[g]);
+ evac_gen = g;
+ for (st = generations[g].n_steps-1; st >= 0; st--) {
+ scavenge(&generations[g].steps[st]);
}
- *pp = tmp;
}
}
/* scavenge each step in generations 0..maxgen */
{
- int gen;
+ int gen, st;
+ loop2:
for (gen = RtsFlags.GcFlags.generations-1; gen >= 0; gen--) {
- for (s = 0; s < generations[gen].n_steps; s++) {
- step = &generations[gen].steps[s];
+ for (st = generations[gen].n_steps-1; st >= 0 ; st--) {
+ step = &generations[gen].steps[st];
evac_gen = gen;
if (step->hp_bd != step->scan_bd || step->scan < step->hp) {
scavenge(step);
flag = rtsTrue;
+ goto loop2;
}
if (step->new_large_objects != NULL) {
scavenge_large(step);
flag = rtsTrue;
+ goto loop2;
}
}
}
}
}
}
- } else {
- /* For a two-space collector, we need to resize the nursery. */
-
- /* set up a new nursery. Allocate a nursery size based on a
- * function of the amount of live data (currently a factor of 2,
- * should be configurable (ToDo)). Use the blocks from the old
- * nursery if possible, freeing up any left over blocks.
- *
- * If we get near the maximum heap size, then adjust our nursery
- * size accordingly. If the nursery is the same size as the live
- * data (L), then we need 3L bytes. We can reduce the size of the
- * nursery to bring the required memory down near 2L bytes.
- *
- * A normal 2-space collector would need 4L bytes to give the same
- * performance we get from 3L bytes, reducing to the same
- * performance at 2L bytes.
- */
- nat blocks = g0s0->to_blocks;
-
- if ( blocks * RtsFlags.GcFlags.oldGenFactor * 2 >
- RtsFlags.GcFlags.maxHeapSize ) {
- int adjusted_blocks; /* signed on purpose */
- 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));
- pc_free = adjusted_blocks * 100 / RtsFlags.GcFlags.maxHeapSize;
- if (pc_free < RtsFlags.GcFlags.pcFreeHeap) /* might even be < 0 */ {
- heapOverflow();
- }
- blocks = adjusted_blocks;
-
- } else {
- blocks *= RtsFlags.GcFlags.oldGenFactor;
- if (blocks < RtsFlags.GcFlags.minAllocAreaSize) {
- blocks = RtsFlags.GcFlags.minAllocAreaSize;
- }
- }
-
- if (nursery_blocks < blocks) {
- IF_DEBUG(gc, fprintf(stderr, "Increasing size of nursery to %d blocks\n",
- blocks));
- g0s0->blocks = allocNursery(g0s0->blocks, blocks-nursery_blocks);
- } else {
- bdescr *next_bd;
-
- IF_DEBUG(gc, fprintf(stderr, "Decreasing size of nursery to %d blocks\n",
- blocks));
- for (bd = g0s0->blocks; nursery_blocks > blocks; nursery_blocks--) {
- next_bd = bd->link;
- freeGroup(bd);
- bd = next_bd;
- }
- g0s0->blocks = bd;
- }
-
- g0s0->n_blocks = nursery_blocks = blocks;
}
/* run through all the generations/steps and tidy up
* between the maximum size of the oldest and youngest
* generations.
*
- * max_blocks = alloc_area_size +
- * (oldgen_max_blocks - alloc_area_size) * G
- * -----------------------------------------
- * oldest_gen
+ * max_blocks = oldgen_max_blocks * G
+ * ----------------------
+ * oldest_gen
*/
if (g != 0) {
- generations[g].max_blocks =
- RtsFlags.GcFlags.minAllocAreaSize +
- (((oldest_gen->max_blocks - RtsFlags.GcFlags.minAllocAreaSize) * g)
- / (RtsFlags.GcFlags.generations-1));
+ generations[g].max_blocks = (oldest_gen->max_blocks * g)
+ / (RtsFlags.GcFlags.generations-1);
}
/* for older generations... */
}
}
+ /* Guess the amount of live data for stats. */
+ live = calcLive();
+
/* Two-space collector:
* Free the old to-space, and estimate the amount of live data.
*/
if (RtsFlags.GcFlags.generations == 1) {
+ nat blocks;
+
if (old_to_space != NULL) {
freeChain(old_to_space);
}
for (bd = g0s0->to_space; bd != NULL; bd = bd->link) {
bd->evacuated = 0; /* now from-space */
}
- live = g0s0->to_blocks * BLOCK_SIZE_W +
- ((lnat)g0s0->hp_bd->free - (lnat)g0s0->hp_bd->start) / sizeof(W_);
- /* Generational collector:
- * estimate the amount of live data.
- */
+ /* For a two-space collector, we need to resize the nursery. */
+
+ /* set up a new nursery. Allocate a nursery size based on a
+ * function of the amount of live data (currently a factor of 2,
+ * should be configurable (ToDo)). Use the blocks from the old
+ * nursery if possible, freeing up any left over blocks.
+ *
+ * If we get near the maximum heap size, then adjust our nursery
+ * size accordingly. If the nursery is the same size as the live
+ * data (L), then we need 3L bytes. We can reduce the size of the
+ * nursery to bring the required memory down near 2L bytes.
+ *
+ * A normal 2-space collector would need 4L bytes to give the same
+ * performance we get from 3L bytes, reducing to the same
+ * performance at 2L bytes.
+ */
+ blocks = g0s0->n_blocks;
+
+ if ( blocks * RtsFlags.GcFlags.oldGenFactor * 2 >
+ RtsFlags.GcFlags.maxHeapSize ) {
+ int adjusted_blocks; /* signed on purpose */
+ 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));
+ pc_free = adjusted_blocks * 100 / RtsFlags.GcFlags.maxHeapSize;
+ if (pc_free < RtsFlags.GcFlags.pcFreeHeap) /* might even be < 0 */ {
+ heapOverflow();
+ }
+ blocks = adjusted_blocks;
+
+ } else {
+ blocks *= RtsFlags.GcFlags.oldGenFactor;
+ if (blocks < RtsFlags.GcFlags.minAllocAreaSize) {
+ blocks = RtsFlags.GcFlags.minAllocAreaSize;
+ }
+ }
+ resizeNursery(blocks);
+
} else {
- live = 0;
- for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
- for (s = 0; s < generations[g].n_steps; s++) {
- /* approximate amount of live data (doesn't take into account slop
- * at end of each block). ToDo: this more accurately.
- */
- if (g == 0 && s == 0) { continue; }
- step = &generations[g].steps[s];
- live += step->n_blocks * BLOCK_SIZE_W +
- ((lnat)step->hp_bd->free -(lnat)step->hp_bd->start) / sizeof(W_);
+ /* Generational collector:
+ * If the user has given us a suggested heap size, adjust our
+ * allocation area to make best use of the memory available.
+ */
+
+ if (RtsFlags.GcFlags.heapSizeSuggestion) {
+ int blocks;
+ nat needed = calcNeeded(); /* approx blocks needed at next GC */
+
+ /* Guess how much will be live in generation 0 step 0 next time.
+ * A good approximation is the amount of data that was live this
+ * time: this assumes (1) that the size of G0S0 will be roughly
+ * the same as last time, and (2) that the promotion rate will be
+ * constant.
+ *
+ * If we don't know how much was live in G0S0 (because there's no
+ * step 1), then assume 30% (which is usually an overestimate).
+ */
+ if (g0->n_steps == 1) {
+ needed += (g0s0->n_blocks * 30) / 100;
+ } else {
+ needed += g0->steps[1].n_blocks;
+ }
+
+ /* Now we have a rough guess at the number of blocks needed for
+ * the next GC, subtract this from the user's suggested heap size
+ * and use the rest for the allocation area.
+ */
+ blocks = (int)RtsFlags.GcFlags.heapSizeSuggestion - (int)needed;
+
+ if (blocks < (int)RtsFlags.GcFlags.minAllocAreaSize) {
+ blocks = RtsFlags.GcFlags.minAllocAreaSize;
}
+
+ resizeNursery((nat)blocks);
}
}
scheduleFinalisers(old_weak_ptr_list);
/* check sanity after GC */
-#ifdef DEBUG
- if (RtsFlags.GcFlags.generations == 1) {
- IF_DEBUG(sanity, checkHeap(g0s0->to_space, NULL));
- IF_DEBUG(sanity, checkChain(g0s0->large_objects));
- } else {
-
- for (g = 0; g <= N; g++) {
- for (s = 0; s < generations[g].n_steps; s++) {
- if (g == 0 && s == 0) { continue; }
- IF_DEBUG(sanity, checkHeap(generations[g].steps[s].blocks, NULL));
- }
- }
- for (g = N+1; g < RtsFlags.GcFlags.generations; g++) {
- for (s = 0; s < generations[g].n_steps; s++) {
- IF_DEBUG(sanity, checkHeap(generations[g].steps[s].blocks,
- generations[g].steps[s].blocks->start));
- IF_DEBUG(sanity, checkChain(generations[g].steps[s].large_objects));
- }
- }
- IF_DEBUG(sanity, checkFreeListSanity());
- }
-#endif
+ IF_DEBUG(sanity, checkSanity(N));
+ /* extra GC trace info */
IF_DEBUG(gc, stat_describe_gens());
#ifdef DEBUG
{
P_ to, from, dest;
+ TICK_GC_WORDS_COPIED(size);
/* Find out where we're going, using the handy "to" pointer in
* the step of the source object. If it turns out we need to
* evacuate to an older generation, adjust it here (see comment
{
P_ dest, to, from;
+ TICK_GC_WORDS_COPIED(size_to_copy);
if (step->gen->no < evac_gen) {
step = &generations[evac_gen].steps[0];
}
}
/* -----------------------------------------------------------------------------
- Evacuate a mutable object
-
- If we evacuate a mutable object to an old generation, cons the
- object onto the older generation's mutable list.
- -------------------------------------------------------------------------- */
-
-static inline void
-evacuate_mutable(StgMutClosure *c)
-{
- bdescr *bd;
-
- bd = Bdescr((P_)c);
- if (bd->gen->no > 0) {
- c->mut_link = bd->gen->mut_list;
- bd->gen->mut_list = c;
- }
-}
-
-/* -----------------------------------------------------------------------------
Evacuate a large object
This just consists of removing the object from the (doubly-linked)
bd->evacuated = 1;
if (mutable) {
- evacuate_mutable((StgMutClosure *)p);
+ recordMutable((StgMutClosure *)p);
}
}
SET_HDR(q,&MUT_CONS_info,CCS_GC);
q->var = ptr;
- evacuate_mutable((StgMutClosure *)q);
+ recordOldToNewPtrs((StgMutClosure *)q);
return (StgClosure *)q;
}
return to;
case MUT_VAR:
+ ASSERT(q->header.info != &MUT_CONS_info);
case MVAR:
to = copy(q,sizeW_fromITBL(info),step);
upd_evacuee(q,to);
- evacuate_mutable((StgMutClosure *)to);
+ recordMutable((StgMutClosure *)to);
return to;
case STABLE_NAME:
case BLACKHOLE_BQ:
to = copy(q,BLACKHOLE_sizeW(),step);
upd_evacuee(q,to);
- evacuate_mutable((StgMutClosure *)to);
+ recordMutable((StgMutClosure *)to);
return to;
case THUNK_SELECTOR:
/* fprintf(stderr,"evac failed!\n");*/
failed_to_evac = rtsTrue;
TICK_GC_FAILED_PROMOTION();
- }
+ }
}
return ((StgEvacuated*)q)->evacuee;
to = copy(q,size,step);
upd_evacuee(q,to);
if (info->type == MUT_ARR_PTRS) {
- evacuate_mutable((StgMutClosure *)to);
+ recordMutable((StgMutClosure *)to);
}
}
return to;
relocate_TSO(tso, new_tso);
upd_evacuee(q,(StgClosure *)new_tso);
- evacuate_mutable((StgMutClosure *)new_tso);
+ recordMutable((StgMutClosure *)new_tso);
return (StgClosure *)new_tso;
}
}
evacuate((StgClosure *)bh->blocking_queue);
if (failed_to_evac) {
failed_to_evac = rtsFalse;
- evacuate_mutable((StgMutClosure *)bh);
+ recordMutable((StgMutClosure *)bh);
}
p += BLACKHOLE_sizeW();
break;
}
if (failed_to_evac) {
/* we can do this easier... */
- evacuate_mutable((StgMutClosure *)start);
+ recordMutable((StgMutClosure *)start);
failed_to_evac = rtsFalse;
}
break;
objects can have this property.
-------------------------------------------------------------------------- */
static rtsBool
-scavenge_one(StgPtr p)
+scavenge_one(StgClosure *p)
{
StgInfoTable *info;
rtsBool no_luck;
- ASSERT(p && (LOOKS_LIKE_GHC_INFO(GET_INFO((StgClosure *)p))
- || IS_HUGS_CONSTR_INFO(GET_INFO((StgClosure *)p))));
+ ASSERT(p && (LOOKS_LIKE_GHC_INFO(GET_INFO(p))
+ || IS_HUGS_CONSTR_INFO(GET_INFO(p))));
- info = get_itbl((StgClosure *)p);
+ info = get_itbl(p);
switch (info -> type) {
case CAF_UNENTERED:
case CAF_ENTERED:
{
- StgPtr end;
+ StgPtr q, end;
- end = (P_)((StgClosure *)p)->payload + info->layout.payload.ptrs;
- for (p = (P_)((StgClosure *)p)->payload; p < end; p++) {
- (StgClosure *)*p = evacuate((StgClosure *)*p);
+ end = (P_)p->payload + info->layout.payload.ptrs;
+ for (q = (P_)p->payload; q < end; q++) {
+ (StgClosure *)*q = evacuate((StgClosure *)*q);
}
break;
}
{
StgSelector *s = (StgSelector *)p;
s->selectee = evacuate(s->selectee);
- break;
+ break;
}
case AP_UPD: /* same as PAPs */
* evacuate the function pointer too...
*/
{
- StgPAP* pap = stgCast(StgPAP*,p);
+ StgPAP* pap = (StgPAP *)p;
pap->fun = evacuate(pap->fun);
scavenge_stack((P_)pap->payload, (P_)pap->payload + pap->n_args);
remove non-mutable objects from the mutable list at this point.
-------------------------------------------------------------------------- */
-static StgMutClosure *
-scavenge_mutable_list(StgMutClosure *p, nat gen)
+static void
+scavenge_mut_once_list(generation *gen)
{
StgInfoTable *info;
- StgMutClosure *start;
- StgMutClosure **prev;
+ StgMutClosure *p, *next, *new_list;
- evac_gen = 0;
+ p = gen->mut_once_list;
+ new_list = END_MUT_LIST;
+ next = p->mut_link;
- prev = &start;
- start = p;
+ evac_gen = gen->no;
+ failed_to_evac = rtsFalse;
+ for (; p != END_MUT_LIST; p = next, next = p->mut_link) {
+
+ /* 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))));
+
+ info = get_itbl(p);
+ switch(info->type) {
+
+ case IND_OLDGEN:
+ case IND_OLDGEN_PERM:
+ case IND_STATIC:
+ /* Try to pull the indirectee into this generation, so we can
+ * remove the indirection from the mutable list.
+ */
+ ((StgIndOldGen *)p)->indirectee =
+ evacuate(((StgIndOldGen *)p)->indirectee);
+
+#if 0
+ /* Debugging code to print out the size of the thing we just
+ * promoted
+ */
+ {
+ StgPtr start = gen->steps[0].scan;
+ bdescr *start_bd = gen->steps[0].scan_bd;
+ nat size = 0;
+ scavenge(&gen->steps[0]);
+ if (start_bd != gen->steps[0].scan_bd) {
+ size += (P_)BLOCK_ROUND_UP(start) - start;
+ start_bd = start_bd->link;
+ while (start_bd != gen->steps[0].scan_bd) {
+ size += BLOCK_SIZE_W;
+ start_bd = start_bd->link;
+ }
+ size += gen->steps[0].scan -
+ (P_)BLOCK_ROUND_DOWN(gen->steps[0].scan);
+ } else {
+ size = gen->steps[0].scan - start;
+ }
+ fprintf(stderr,"evac IND_OLDGEN: %d bytes\n", size * sizeof(W_));
+ }
+#endif
+
+ /* failed_to_evac might happen if we've got more than two
+ * generations, we're collecting only generation 0, the
+ * indirection resides in generation 2 and the indirectee is
+ * in generation 1.
+ */
+ if (failed_to_evac) {
+ failed_to_evac = rtsFalse;
+ p->mut_link = new_list;
+ new_list = p;
+ } else {
+ /* the mut_link field of an IND_STATIC is overloaded as the
+ * static link field too (it just so happens that we don't need
+ * both at the same time), so we need to NULL it out when
+ * removing this object from the mutable list because the static
+ * link fields are all assumed to be NULL before doing a major
+ * collection.
+ */
+ p->mut_link = NULL;
+ }
+ continue;
+
+ case MUT_VAR:
+ /* MUT_CONS is a kind of MUT_VAR, except it that we try to remove
+ * it from the mutable list if possible by promoting whatever it
+ * points to.
+ */
+ ASSERT(p->header.info == &MUT_CONS_info);
+ if (scavenge_one(((StgMutVar *)p)->var) == rtsTrue) {
+ /* didn't manage to promote everything, so put the
+ * MUT_CONS back on the list.
+ */
+ p->mut_link = new_list;
+ new_list = p;
+ }
+ continue;
+
+ default:
+ /* shouldn't have anything else on the mutables list */
+ barf("scavenge_mut_once_list: strange object?");
+ }
+ }
+
+ gen->mut_once_list = new_list;
+}
+
+
+static void
+scavenge_mutable_list(generation *gen)
+{
+ StgInfoTable *info;
+ StgMutClosure *p, *next, *new_list;
+
+ p = gen->saved_mut_list;
+ new_list = END_MUT_LIST;
+ next = p->mut_link;
+
+ evac_gen = 0;
failed_to_evac = rtsFalse;
- for (; p != END_MUT_LIST; p = *prev) {
+ for (; p != END_MUT_LIST; p = next, next = p->mut_link) {
/* make sure the info pointer is into text space */
ASSERT(p && (LOOKS_LIKE_GHC_INFO(GET_INFO(p))
StgPtr end, q;
end = (P_)p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p);
- evac_gen = gen;
+ evac_gen = gen->no;
for (q = (P_)((StgMutArrPtrs *)p)->payload; q < end; q++) {
(StgClosure *)*q = evacuate((StgClosure *)*q);
}
if (failed_to_evac) {
failed_to_evac = rtsFalse;
- prev = &p->mut_link;
- } else {
- *prev = p->mut_link;
- }
+ p->mut_link = new_list;
+ new_list = p;
+ }
continue;
}
case MUT_ARR_PTRS:
/* follow everything */
- prev = &p->mut_link;
+ p->mut_link = new_list;
+ new_list = p;
{
StgPtr end, q;
* it from the mutable list if possible by promoting whatever it
* points to.
*/
- if (p->header.info == &MUT_CONS_info) {
- evac_gen = gen;
- if (scavenge_one((P_)((StgMutVar *)p)->var) == rtsTrue) {
- /* didn't manage to promote everything, so leave the
- * MUT_CONS on the list.
- */
- prev = &p->mut_link;
- } else {
- *prev = p->mut_link;
- }
- evac_gen = 0;
- } else {
- ((StgMutVar *)p)->var = evacuate(((StgMutVar *)p)->var);
- prev = &p->mut_link;
- }
+ ASSERT(p->header.info != &MUT_CONS_info);
+ ((StgMutVar *)p)->var = evacuate(((StgMutVar *)p)->var);
+ p->mut_link = new_list;
+ new_list = p;
continue;
case MVAR:
(StgClosure *)mvar->head = evacuate((StgClosure *)mvar->head);
(StgClosure *)mvar->tail = evacuate((StgClosure *)mvar->tail);
(StgClosure *)mvar->value = evacuate((StgClosure *)mvar->value);
- prev = &p->mut_link;
+ p->mut_link = new_list;
+ new_list = p;
continue;
}
* point to some younger objects (because we set evac_gen to 0
* above).
*/
- prev = &tso->mut_link;
+ tso->mut_link = new_list;
+ new_list = (StgMutClosure *)tso;
continue;
}
- case IND_OLDGEN:
- case IND_OLDGEN_PERM:
- case IND_STATIC:
- /* Try to pull the indirectee into this generation, so we can
- * remove the indirection from the mutable list.
- */
- evac_gen = gen;
- ((StgIndOldGen *)p)->indirectee =
- evacuate(((StgIndOldGen *)p)->indirectee);
- evac_gen = 0;
-
- if (failed_to_evac) {
- failed_to_evac = rtsFalse;
- prev = &p->mut_link;
- } else {
- *prev = p->mut_link;
- /* the mut_link field of an IND_STATIC is overloaded as the
- * static link field too (it just so happens that we don't need
- * both at the same time), so we need to NULL it out when
- * removing this object from the mutable list because the static
- * link fields are all assumed to be NULL before doing a major
- * collection.
- */
- p->mut_link = NULL;
- }
- continue;
-
case BLACKHOLE_BQ:
{
StgBlockingQueue *bh = (StgBlockingQueue *)p;
(StgClosure *)bh->blocking_queue =
evacuate((StgClosure *)bh->blocking_queue);
- prev = &p->mut_link;
- break;
+ p->mut_link = new_list;
+ new_list = p;
+ continue;
}
default:
/* shouldn't have anything else on the mutables list */
- barf("scavenge_mutable_object: non-mutable object?");
+ barf("scavenge_mut_list: strange object?");
}
}
- return start;
+
+ gen->mut_list = new_list;
}
static void
if (failed_to_evac) {
failed_to_evac = rtsFalse;
scavenged_static_objects = STATIC_LINK(info,p);
- ((StgMutClosure *)ind)->mut_link = oldest_gen->mut_list;
- oldest_gen->mut_list = (StgMutClosure *)ind;
+ ((StgMutClosure *)ind)->mut_link = oldest_gen->mut_once_list;
+ oldest_gen->mut_once_list = (StgMutClosure *)ind;
}
break;
}
to = copy(frame->updatee, BLACKHOLE_sizeW(), step);
upd_evacuee(frame->updatee,to);
frame->updatee = to;
- evacuate_mutable((StgMutClosure *)to);
+ recordMutable((StgMutClosure *)to);
continue;
default:
barf("scavenge_stack: UPDATE_FRAME updatee");
}
evac_gen = 0;
if (failed_to_evac) {
- evacuate_mutable((StgMutClosure *)start);
+ recordMutable((StgMutClosure *)start);
}
continue;
}