X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FGC.c;h=722de0facc0ba49eaf71610cbbabba327606d55c;hb=27a28cf6bc2196ee1690ac1fcc4d4c59d9b0d50f;hp=dc514652c3c84d94f160795d2e53b4a040842f3d;hpb=7e9347139202710b6d61a77b72216d5da09a5cca;p=ghc-hetmet.git diff --git a/rts/sm/GC.c b/rts/sm/GC.c index dc51465..722de0f 100644 --- a/rts/sm/GC.c +++ b/rts/sm/GC.c @@ -195,8 +195,6 @@ GarbageCollect ( rtsBool force_major_gc ) ACQUIRE_SM_LOCK; - debugTrace(DEBUG_gc, "starting GC"); - #if defined(RTS_USER_SIGNALS) if (RtsFlags.MiscFlags.install_signal_handlers) { // block signals @@ -248,11 +246,11 @@ GarbageCollect ( rtsBool force_major_gc ) } else { n_gc_threads = RtsFlags.ParFlags.gcThreads; } - trace(TRACE_gc|DEBUG_gc, "GC (gen %d): %dKB to collect, using %d thread(s)", - N, n * (BLOCK_SIZE / 1024), n_gc_threads); #else n_gc_threads = 1; #endif + trace(TRACE_gc|DEBUG_gc, "GC (gen %d): %dKB to collect, using %d thread(s)", + N, n * (BLOCK_SIZE / 1024), n_gc_threads); #ifdef RTS_GTK_FRONTPANEL if (RtsFlags.GcFlags.frontpanel) { @@ -422,22 +420,37 @@ GarbageCollect ( rtsBool force_major_gc ) ws = &thr->steps[s]; // Not true? // ASSERT( ws->scan_bd == ws->todo_bd ); - ASSERT( ws->scan_bd ? ws->scan == ws->scan_bd->free : 1 ); + ASSERT( ws->scan_bd ? ws->scan_bd->u.scan == ws->scan_bd->free : 1 ); // Push the final block - if (ws->scan_bd) { push_scan_block(ws->scan_bd, ws); } + if (ws->scan_bd) { push_scanned_block(ws->scan_bd, ws); } ASSERT(countBlocks(ws->scavd_list) == ws->n_scavd_blocks); - prev = ws->scavd_list; + prev = ws->part_list; + for (bd = ws->part_list; bd != NULL; bd = bd->link) { + bd->flags &= ~BF_EVACUATED; // now from-space + ws->step->n_words += bd->free - bd->start; + prev = bd; + } + if (prev != NULL) { + prev->link = ws->scavd_list; + } for (bd = ws->scavd_list; bd != NULL; bd = bd->link) { bd->flags &= ~BF_EVACUATED; // now from-space + ws->step->n_words += bd->free - bd->start; prev = bd; } - prev->link = ws->stp->blocks; - ws->stp->blocks = ws->scavd_list; - ws->stp->n_blocks += ws->n_scavd_blocks; - ASSERT(countBlocks(ws->stp->blocks) == ws->stp->n_blocks); + prev->link = ws->step->blocks; + if (ws->part_list != NULL) { + ws->step->blocks = ws->part_list; + } else { + ws->step->blocks = ws->scavd_list; + } + ws->step->n_blocks += ws->n_part_blocks; + ws->step->n_blocks += ws->n_scavd_blocks; + ASSERT(countBlocks(ws->step->blocks) == ws->step->n_blocks); + ASSERT(countOccupied(ws->step->blocks) == ws->step->n_words); } } } @@ -466,8 +479,7 @@ GarbageCollect ( rtsBool force_major_gc ) trace(TRACE_gc," copied %ld", gc_threads[i]->copied * sizeof(W_)); trace(TRACE_gc," any_work %ld", gc_threads[i]->any_work); trace(TRACE_gc," no_work %ld", gc_threads[i]->no_work); - trace(TRACE_gc," scav_global_work %ld", gc_threads[i]->scav_global_work); - trace(TRACE_gc," scav_local_work %ld", gc_threads[i]->scav_local_work); + trace(TRACE_gc," scav_find_work %ld", gc_threads[i]->scav_find_work); } copied += gc_threads[i]->copied; } @@ -512,6 +524,7 @@ GarbageCollect ( rtsBool force_major_gc ) // onto the front of the now-compacted existing blocks. for (bd = stp->blocks; bd != NULL; bd = bd->link) { bd->flags &= ~BF_EVACUATED; // now from-space + stp->n_words += bd->free - bd->start; } // tack the new blocks on the end of the existing blocks if (stp->old_blocks != NULL) { @@ -531,6 +544,7 @@ GarbageCollect ( rtsBool force_major_gc ) // add the new blocks to the block tally stp->n_blocks += stp->n_old_blocks; ASSERT(countBlocks(stp->blocks) == stp->n_blocks); + ASSERT(countOccupied(stp->blocks) == stp->n_words); } else // not copacted { @@ -580,10 +594,8 @@ GarbageCollect ( rtsBool force_major_gc ) // update the max size of older generations after a major GC resize_generations(); - // Guess the amount of live data for stats. - live = calcLiveBlocks() * BLOCK_SIZE_W; - debugTrace(DEBUG_gc, "Slop: %ldKB", - (live - calcLiveWords()) / (1024/sizeof(W_))); + // Calculate the amount of live data for stats. + live = calcLiveWords(); // Free the small objects allocated via allocate(), since this will // all have been copied into G0S1 now. @@ -593,6 +605,7 @@ GarbageCollect ( rtsBool force_major_gc ) g0s0->blocks = NULL; } g0s0->n_blocks = 0; + g0s0->n_words = 0; } alloc_blocks = 0; alloc_blocks_lim = RtsFlags.GcFlags.minAllocAreaSize; @@ -930,7 +943,7 @@ initialise_N (rtsBool force_major_gc) for (g = RtsFlags.GcFlags.generations - 1; g >= 0; g--) { blocks = 0; for (s = 0; s < generations[g].n_steps; s++) { - blocks += generations[g].steps[s].n_blocks; + blocks += generations[g].steps[s].n_words / BLOCK_SIZE_W; blocks += generations[g].steps[s].n_large_blocks; } if (blocks >= generations[g].max_blocks) { @@ -982,16 +995,18 @@ alloc_gc_thread (int n) for (s = 0; s < total_steps; s++) { ws = &t->steps[s]; - ws->stp = &all_steps[s]; - ASSERT(s == ws->stp->abs_no); + ws->step = &all_steps[s]; + ASSERT(s == ws->step->abs_no); ws->gct = t; ws->scan_bd = NULL; - ws->scan = NULL; ws->todo_bd = NULL; ws->buffer_todo_bd = NULL; + ws->part_list = NULL; + ws->n_part_blocks = 0; + ws->scavd_list = NULL; ws->n_scavd_blocks = 0; } @@ -1241,6 +1256,7 @@ init_collected_gen (nat g, nat n_threads) stp->n_old_blocks = stp->n_blocks; stp->blocks = NULL; stp->n_blocks = 0; + stp->n_words = 0; // we don't have any to-be-scavenged blocks yet stp->todos = NULL; @@ -1305,15 +1321,17 @@ init_collected_gen (nat g, nat n_threads) ws = &gc_threads[t]->steps[g * RtsFlags.GcFlags.steps + s]; ws->scan_bd = NULL; - ws->scan = NULL; ws->todo_large_objects = NULL; + ws->part_list = NULL; + ws->n_part_blocks = 0; + // allocate the first to-space block; extra blocks will be // chained on as necessary. ws->todo_bd = NULL; ws->buffer_todo_bd = NULL; - gc_alloc_todo_block(ws); + alloc_todo_block(ws,0); ws->scavd_list = NULL; ws->n_scavd_blocks = 0; @@ -1344,11 +1362,14 @@ init_uncollected_gen (nat g, nat threads) for (s = 0; s < generations[g].n_steps; s++) { ws = &gc_threads[t]->steps[g * RtsFlags.GcFlags.steps + s]; - stp = ws->stp; + stp = ws->step; ws->buffer_todo_bd = NULL; ws->todo_large_objects = NULL; + ws->part_list = NULL; + ws->n_part_blocks = 0; + ws->scavd_list = NULL; ws->n_scavd_blocks = 0; @@ -1361,12 +1382,13 @@ init_uncollected_gen (nat g, nat threads) ws->todo_lim = ws->todo_bd->start + BLOCK_SIZE_W; stp->blocks = stp->blocks->link; stp->n_blocks -= 1; + stp->n_words -= ws->todo_bd->free - ws->todo_bd->start; ws->todo_bd->link = NULL; // this block is also the scan block; we must scan // from the current end point. ws->scan_bd = ws->todo_bd; - ws->scan = ws->scan_bd->free; + ws->scan_bd->u.scan = ws->scan_bd->free; // subtract the contents of this block from the stats, // because we'll count the whole block later. @@ -1375,9 +1397,8 @@ init_uncollected_gen (nat g, nat threads) else { ws->scan_bd = NULL; - ws->scan = NULL; ws->todo_bd = NULL; - gc_alloc_todo_block(ws); + alloc_todo_block(ws,0); } } } @@ -1411,8 +1432,7 @@ init_gc_thread (gc_thread *t) t->copied = 0; t->any_work = 0; t->no_work = 0; - t->scav_global_work = 0; - t->scav_local_work = 0; + t->scav_find_work = 0; } @@ -1533,7 +1553,7 @@ resize_generations (void) nat gens = RtsFlags.GcFlags.generations; // live in the oldest generations - live = oldest_gen->steps[0].n_blocks + + live = (oldest_gen->steps[0].n_words + BLOCK_SIZE_W - 1) / BLOCK_SIZE_W+ oldest_gen->steps[0].n_large_blocks; // default max size for all generations except zero