X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfHeap.c;h=362bafe2d3bb78cf8004d6b02df89ae574eb75f5;hb=91b07216be1cb09230b7d1b417899ddea8620ff3;hp=9fbfbfee4b32e3899c246bd3a7e689acee949d9a;hpb=e7c3f957fd36fd9f6369183b7a31e2a4a4c21b43;p=ghc-hetmet.git diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c index 9fbfbfe..362bafe 100644 --- a/ghc/rts/ProfHeap.c +++ b/ghc/rts/ProfHeap.c @@ -23,7 +23,6 @@ #include "ProfHeap.h" #include "Stats.h" #include "Hash.h" -#include "StrHash.h" #include "RetainerProfile.h" #include "LdvProfile.h" #include "Arena.h" @@ -150,17 +149,17 @@ static char *type_names[] = { , "STOP_FRAME" , "BLACKHOLE" - , "BLACKHOLE_BQ" , "MVAR" , "ARR_WORDS" - , "MUT_ARR_PTRS" + , "MUT_ARR_PTRS_CLEAN" + , "MUT_ARR_PTRS_DIRTY" , "MUT_ARR_PTRS_FROZEN" - , "MUT_VAR" + , "MUT_VAR_CLEAN" + , "MUT_VAR_DIRTY" , "WEAK" - , "FOREIGN" , "TSO" @@ -228,7 +227,7 @@ doingRetainerProfiling( void ) return (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER || RtsFlags.ProfFlags.retainerSelector != NULL); } -#endif // PROFILING +#endif /* PROFILING */ // Precesses a closure 'c' being destroyed whose size is 'size'. // Make sure that LDV_recordDead() is not invoked on 'inherently used' closures @@ -341,7 +340,7 @@ nextEra( void ) "nextEra"); } } -#endif // PROFILING +#endif /* PROFILING */ initEra( &censuses[era] ); } @@ -406,7 +405,7 @@ initHeapProfiling(void) #ifdef PROFILING if (doingLDVProfiling() && doingRetainerProfiling()) { errorBelch("cannot mix -hb and -hr"); - stg_exit(1); + stg_exit(EXIT_FAILURE); } #endif @@ -530,7 +529,7 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length) return; } - fprintf(fp, "(%d)", ccs->ccsID); + fprintf(fp, "(%ld)", ccs->ccsID); p = buf; buf_end = buf + max_length + 1; @@ -560,7 +559,7 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length) } fprintf(fp, "%s", buf); } -#endif // PROFILING +#endif /* PROFILING */ rtsBool strMatchesSelector( char* str, char* sel ) @@ -745,15 +744,15 @@ dumpCensus( Census *census ) #ifdef PROFILING if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_LDV) { - fprintf(hp_file, "VOID\t%u\n", census->void_total * sizeof(W_)); - fprintf(hp_file, "LAG\t%u\n", - (census->not_used - census->void_total) * sizeof(W_)); - fprintf(hp_file, "USE\t%u\n", - (census->used - census->drag_total) * sizeof(W_)); - fprintf(hp_file, "INHERENT_USE\t%u\n", - census->prim * sizeof(W_)); - fprintf(hp_file, "DRAG\t%u\n", census->drag_total * - sizeof(W_)); + fprintf(hp_file, "VOID\t%lu\n", (unsigned long)(census->void_total) * sizeof(W_)); + fprintf(hp_file, "LAG\t%lu\n", + (unsigned long)(census->not_used - census->void_total) * sizeof(W_)); + fprintf(hp_file, "USE\t%lu\n", + (unsigned long)(census->used - census->drag_total) * sizeof(W_)); + fprintf(hp_file, "INHERENT_USE\t%lu\n", + (unsigned long)(census->prim) * sizeof(W_)); + fprintf(hp_file, "DRAG\t%lu\n", + (unsigned long)(census->drag_total) * sizeof(W_)); printSample(rtsFalse, census->time); return; } @@ -831,7 +830,7 @@ dumpCensus( Census *census ) } #endif - fprintf(hp_file, "\t%d\n", count * sizeof(W_)); + fprintf(hp_file, "\t%lu\n", (unsigned long)count * sizeof(W_)); } printSample(rtsFalse, census->time); @@ -868,9 +867,24 @@ heapCensusChain( Census *census, bdescr *bd ) switch (info->type) { + case THUNK: + size = thunk_sizeW_fromITBL(info); + break; + + case THUNK_1_1: + case THUNK_0_2: + case THUNK_2_0: + size = sizeofW(StgHeader) + stg_max(MIN_UPD_SIZE,2); + break; + + case THUNK_1_0: + case THUNK_0_1: + case THUNK_SELECTOR: + size = sizeofW(StgHeader) + stg_max(MIN_UPD_SIZE,1); + break; + case CONSTR: case FUN: - case THUNK: case IND_PERM: case IND_OLDGEN: case IND_OLDGEN_PERM: @@ -878,7 +892,6 @@ heapCensusChain( Census *census, bdescr *bd ) case SE_CAF_BLACKHOLE: case SE_BLACKHOLE: case BLACKHOLE: - case BLACKHOLE_BQ: case CONSTR_INTLIKE: case CONSTR_CHARLIKE: case FUN_1_0: @@ -886,9 +899,6 @@ heapCensusChain( Census *census, bdescr *bd ) case FUN_1_1: case FUN_0_2: case FUN_2_0: - case THUNK_1_1: - case THUNK_0_2: - case THUNK_2_0: case CONSTR_1_0: case CONSTR_0_1: case CONSTR_1_1: @@ -897,6 +907,17 @@ heapCensusChain( Census *census, bdescr *bd ) size = sizeW_fromITBL(info); break; + case IND: + // Special case/Delicate Hack: INDs don't normally + // appear, since we're doing this heap census right + // after GC. However, GarbageCollect() also does + // resurrectThreads(), which can update some + // blackholes when it calls raiseAsync() on the + // resurrected threads. So we know that any IND will + // be the size of a BLACKHOLE. + size = BLACKHOLE_sizeW(); + break; + case BCO: prim = rtsTrue; size = bco_sizeW((StgBCO *)p); @@ -904,20 +925,17 @@ heapCensusChain( Census *census, bdescr *bd ) case MVAR: case WEAK: - case FOREIGN: case STABLE_NAME: - case MUT_VAR: + case MUT_VAR_CLEAN: + case MUT_VAR_DIRTY: prim = rtsTrue; size = sizeW_fromITBL(info); break; - case THUNK_1_0: /* ToDo - shouldn't be here */ - case THUNK_0_1: /* " ditto " */ - case THUNK_SELECTOR: - size = sizeofW(StgHeader) + MIN_UPD_SIZE; + case AP: + size = ap_sizeW((StgAP *)p); break; - case AP: case PAP: size = pap_sizeW((StgPAP *)p); break; @@ -931,8 +949,10 @@ heapCensusChain( Census *census, bdescr *bd ) size = arr_words_sizeW(stgCast(StgArrWords*,p)); break; - case MUT_ARR_PTRS: + case MUT_ARR_PTRS_CLEAN: + case MUT_ARR_PTRS_DIRTY: case MUT_ARR_PTRS_FROZEN: + case MUT_ARR_PTRS_FROZEN0: prim = rtsTrue; size = mut_arr_ptrs_sizeW((StgMutArrPtrs *)p); break; @@ -953,8 +973,28 @@ heapCensusChain( Census *census, bdescr *bd ) } #endif + case TREC_HEADER: + prim = rtsTrue; + size = sizeofW(StgTRecHeader); + break; + + case TVAR_WAIT_QUEUE: + prim = rtsTrue; + size = sizeofW(StgTVarWaitQueue); + break; + + case TVAR: + prim = rtsTrue; + size = sizeofW(StgTVar); + break; + + case TREC_CHUNK: + prim = rtsTrue; + size = sizeofW(StgTRecChunk); + break; + default: - barf("heapCensus"); + barf("heapCensus, unknown object: %d", info->type); } identity = NULL; @@ -1056,7 +1096,7 @@ heapCensus( void ) // Now traverse the heap in each generation/step. if (RtsFlags.GcFlags.generations == 1) { - heapCensusChain( census, g0s0->to_blocks ); + heapCensusChain( census, g0s0->blocks ); } else { for (g = 0; g < RtsFlags.GcFlags.generations; g++) { for (s = 0; s < generations[g].n_steps; s++) {