X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLdvProfile.c;h=799d418145c4bcd80c6f80d0b88625130cc5baca;hb=5d52d9b64c21dcf77849866584744722f8121389;hp=a1eef17ef16385c351ed5418d497815ddf8f197a;hpb=12c7ad877a75172186bd408dbc2d5b883dfc1361;p=ghc-hetmet.git diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c index a1eef17..799d418 100644 --- a/rts/LdvProfile.c +++ b/rts/LdvProfile.c @@ -109,13 +109,9 @@ processHeapClosureForDead( StgClosure *c ) case MUT_VAR_CLEAN: case MUT_VAR_DIRTY: case BCO: - case STABLE_NAME: - case TVAR_WATCH_QUEUE: - case TVAR: - case TREC_HEADER: + case PRIM: + case MUT_PRIM: case TREC_CHUNK: - case INVARIANT_CHECK_QUEUE: - case ATOMIC_INVARIANT: return size; /* @@ -144,7 +140,7 @@ processHeapClosureForDead( StgClosure *c ) case FUN_1_1: case FUN_0_2: case BLACKHOLE: - case CAF_BLACKHOLE: + case BLOCKING_QUEUE: case IND_PERM: case IND_OLDGEN_PERM: /* @@ -259,7 +255,7 @@ processChainForDead( bdescr *bd ) void LdvCensusForDead( nat N ) { - nat g, s; + nat g; // ldvTime == 0 means that LDV profiling is currently turned off. if (era == 0) @@ -271,16 +267,11 @@ LdvCensusForDead( nat N ) // barf("Lag/Drag/Void profiling not supported with -G1"); } else { - for (g = 0; g <= N; g++) - for (s = 0; s < generations[g].n_steps; s++) { - if (g == 0 && s == 0) { - processNurseryForDead(); - processChainForDead(generations[g].steps[s].large_objects); - } else{ - processHeapForDead(generations[g].steps[s].old_blocks); - processChainForDead(generations[g].steps[s].large_objects); - } - } + processNurseryForDead(); + for (g = 0; g <= N; g++) { + processHeapForDead(generations[g].old_blocks); + processChainForDead(generations[g].large_objects); + } } }