diff options
Diffstat (limited to 'rts/sm/GC.c')
| -rw-r--r-- | rts/sm/GC.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/rts/sm/GC.c b/rts/sm/GC.c index 86231948c1..a6b8c4af64 100644 --- a/rts/sm/GC.c +++ b/rts/sm/GC.c @@ -178,7 +178,7 @@ GarbageCollect (rtsBool force_major_gc, { bdescr *bd; generation *gen; - lnat live_blocks, live_words, allocated, max_copied, avg_copied; + lnat live_blocks, live_words, allocated, par_max_copied, par_tot_copied; #if defined(THREADED_RTS) gc_thread *saved_gct; #endif @@ -209,7 +209,7 @@ GarbageCollect (rtsBool force_major_gc, SET_GCT(gc_threads[cap->no]); // tell the stats department that we've started a GC - stat_startGC(gct); + stat_startGC(cap, gct); // lock the StablePtr table stablePtrPreGC(); @@ -231,7 +231,7 @@ GarbageCollect (rtsBool force_major_gc, /* Approximate how much we allocated. * Todo: only when generating stats? */ - allocated = calcAllocated(rtsFalse/* don't count the nursery yet */); + allocated = countLargeAllocated(); /* don't count the nursery yet */ /* Figure out which generation to collect */ @@ -443,8 +443,8 @@ GarbageCollect (rtsBool force_major_gc, } copied = 0; - max_copied = 0; - avg_copied = 0; + par_max_copied = 0; + par_tot_copied = 0; { nat i; for (i=0; i < n_gc_threads; i++) { @@ -457,13 +457,12 @@ GarbageCollect (rtsBool force_major_gc, debugTrace(DEBUG_gc," scav_find_work %ld", gc_threads[i]->scav_find_work); } copied += gc_threads[i]->copied; - max_copied = stg_max(gc_threads[i]->copied, max_copied); + par_max_copied = stg_max(gc_threads[i]->copied, par_max_copied); } + par_tot_copied = copied; if (n_gc_threads == 1) { - max_copied = 0; - avg_copied = 0; - } else { - avg_copied = copied; + par_max_copied = 0; + par_tot_copied = 0; } } @@ -739,9 +738,9 @@ GarbageCollect (rtsBool force_major_gc, #endif // ok, GC over: tell the stats department what happened. - stat_endGC(gct, allocated, live_words, - copied, N, max_copied, avg_copied, - live_blocks * BLOCK_SIZE_W - live_words /* slop */); + stat_endGC(cap, gct, allocated, live_words, copied, + live_blocks * BLOCK_SIZE_W - live_words /* slop */, + N, n_gc_threads, par_max_copied, par_tot_copied); // Guess which generation we'll collect *next* time initialise_N(force_major_gc); |