diff options
| -rw-r--r-- | rts/Schedule.c | 9 | ||||
| -rw-r--r-- | rts/sm/GC.c | 10 | ||||
| -rw-r--r-- | rts/sm/GC.h | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index 2a2cc22a66..834e3eb420 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -1443,9 +1443,9 @@ delete_threads_and_gc: // reset waiting_for_gc *before* GC, so that when the GC threads // emerge they don't immediately re-enter the GC. waiting_for_gc = 0; - GarbageCollect(force_major || heap_census, gc_type, cap); + GarbageCollect(force_major || heap_census, heap_census, gc_type, cap); #else - GarbageCollect(force_major || heap_census, 0, cap); + GarbageCollect(force_major || heap_census, heap_census, 0, cap); #endif traceEventGcEnd(cap); @@ -1473,10 +1473,9 @@ delete_threads_and_gc: ASSERT(checkSparkCountInvariant()); #endif + // The heap census itself is done during GarbageCollect(). if (heap_census) { - debugTrace(DEBUG_sched, "performing heap census"); - heapCensus(); - performHeapProfile = rtsFalse; + performHeapProfile = rtsFalse; } #if defined(THREADED_RTS) diff --git a/rts/sm/GC.c b/rts/sm/GC.c index 9f69a4c65a..396992ca01 100644 --- a/rts/sm/GC.c +++ b/rts/sm/GC.c @@ -171,6 +171,7 @@ StgPtr mark_sp; // pointer to the next unallocated mark stack entry void GarbageCollect (rtsBool force_major_gc, + rtsBool do_heap_census, nat gc_type USED_IF_THREADS, Capability *cap) { @@ -661,6 +662,15 @@ GarbageCollect (rtsBool force_major_gc, // fill slop. IF_DEBUG(sanity, checkSanity(rtsTrue /* after GC */, major_gc)); + // If a heap census is due, we need to do it before + // resurrectThreads(), for the same reason as checkSanity above: + // resurrectThreads() will overwrite some closures and leave slop + // behind. + if (do_heap_census) { + debugTrace(DEBUG_sched, "performing heap census"); + heapCensus(); + } + // send exceptions to any threads which were about to die RELEASE_SM_LOCK; resurrectThreads(resurrected_threads); diff --git a/rts/sm/GC.h b/rts/sm/GC.h index 38fc87ca44..eb1802338b 100644 --- a/rts/sm/GC.h +++ b/rts/sm/GC.h @@ -16,7 +16,9 @@ #include "BeginPrivate.h" -void GarbageCollect(rtsBool force_major_gc, nat gc_type, Capability *cap); +void GarbageCollect (rtsBool force_major_gc, + rtsBool do_heap_census, + nat gc_type, Capability *cap); typedef void (*evac_fn)(void *user, StgClosure **root); |