X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfHeap.c;h=375254396360f9e0568a3218535c057ff2a80ed0;hb=d139a7ae37a61da8f641f0cae33d0ceb7479f398;hp=ffbbd1da82cbdde57ff2586bc481206308b475f0;hpb=c41b6b7824ce67f0d97a316ada3482035fd4fe3d;p=ghc-hetmet.git diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c index ffbbd1d..3752543 100644 --- a/ghc/rts/ProfHeap.c +++ b/ghc/rts/ProfHeap.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- - * $Id: ProfHeap.c,v 1.37 2002/07/18 09:12:34 simonmar Exp $ + * $Id: ProfHeap.c,v 1.45 2003/03/24 14:46:55 simonmar Exp $ * - * (c) The GHC Team, 1998-2000 + * (c) The GHC Team, 1998-2003 * * Support for heap profiling * @@ -31,6 +31,7 @@ #include "Printer.h" #include +#include /* ----------------------------------------------------------------------------- * era stores the current time period. It is the same as the @@ -95,8 +96,8 @@ typedef struct { int drag_total; } Census; -Census *censuses = NULL; -nat n_censuses = 0; +static Census *censuses = NULL; +static nat n_censuses = 0; #ifdef PROFILING static void aggregateCensusInfo( void ); @@ -127,7 +128,8 @@ static char *type_names[] = { , "THUNK_SELECTOR" , "BCO" - , "AP_UPD" + , "AP_STACK" + , "AP" , "PAP" @@ -146,7 +148,6 @@ static char *type_names[] = { , "UPDATE_FRAME" , "CATCH_FRAME" , "STOP_FRAME" - , "SEQ_FRAME" , "BLACKHOLE" , "BLACKHOLE_BQ" @@ -329,7 +330,8 @@ nextEra( void ) era++; if (era == max_era) { - barf("maximum number of censuses reached; use +RTS -i to reduce"); + prog_belch("maximum number of censuses reached; use +RTS -i to reduce"); + stg_exit(EXIT_FAILURE); } if (era == n_censuses) { @@ -339,7 +341,7 @@ nextEra( void ) } } #endif // PROFILING - + initEra( &censuses[era] ); } @@ -477,13 +479,24 @@ endHeapProfiling(void) #ifdef PROFILING +static size_t +buf_append(char *p, const char *q, char *end) +{ + int m; + + for (m = 0; p < end; p++, q++, m++) { + *p = *q; + if (*q == '\0') { break; } + } + return m; +} + static void fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length) { - char buf[max_length+1]; + char buf[max_length+1], *p, *buf_end; nat next_offset = 0; nat written; - char *template; // MAIN on its own gets printed as "MAIN", otherwise we ignore MAIN. if (ccs == CCS_MAIN) { @@ -493,6 +506,9 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length) fprintf(fp, "(%d)", ccs->ccsID); + p = buf; + buf_end = buf + max_length + 1; + // keep printing components of the stack until we run out of space // in the buffer. If we run out of space, end with "...". for (; ccs != NULL && ccs != CCS_MAIN; ccs = ccs->prevStack) { @@ -500,31 +516,16 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length) // CAF cost centres print as M.CAF, but we leave the module // name out of all the others to save space. if (!strcmp(ccs->cc->label,"CAF")) { -#ifdef HAVE_SNPRINTF - written = snprintf(buf+next_offset, - (int)max_length-3-(int)next_offset, - "%s.CAF", ccs->cc->module); -#else - written = sprintf(buf+next_offset, - "%s.CAF", ccs->cc->module); -#endif + p += buf_append(p, ccs->cc->module, buf_end); + p += buf_append(p, ".CAF", buf_end); } else { if (ccs->prevStack != NULL && ccs->prevStack != CCS_MAIN) { - template = "%s/"; - } else { - template = "%s"; + p += buf_append(p, "/", buf_end); } -#ifdef HAVE_SNPRINTF - written = snprintf(buf+next_offset, - (int)max_length-3-(int)next_offset, - template, ccs->cc->label); -#else - written = sprintf(buf+next_offset, - template, ccs->cc->label); -#endif + p += buf_append(p, ccs->cc->label, buf_end); } - - if (next_offset+written >= max_length-4) { + + if (p >= buf_end) { sprintf(buf+max_length-4, "..."); break; } else { @@ -591,12 +592,18 @@ closureSatisfiesConstraints( StgClosure* p ) if (RtsFlags.ProfFlags.retainerSelector) { RetainerSet *rs; nat i; - rs = retainerSetOf((StgClosure *)p); - if (rs != NULL) { - for (i = 0; i < rs->num; i++) { - b = strMatchesSelector( rs->element[i]->cc->label, - RtsFlags.ProfFlags.retainerSelector ); - if (b) return rtsTrue; + // We must check that the retainer set is valid here. One + // reason it might not be valid is if this closure is a + // a newly deceased weak pointer (i.e. a DEAD_WEAK), since + // these aren't reached by the retainer profiler's traversal. + if (isRetainerSetFieldValid((StgClosure *)p)) { + rs = retainerSetOf((StgClosure *)p); + if (rs != NULL) { + for (i = 0; i < rs->num; i++) { + b = strMatchesSelector( rs->element[i]->cc->label, + RtsFlags.ProfFlags.retainerSelector ); + if (b) return rtsTrue; + } } } return rtsFalse; @@ -854,6 +861,10 @@ heapCensusChain( Census *census, bdescr *bd ) break; case BCO: + prim = rtsTrue; + size = bco_sizeW((StgBCO *)p); + break; + case MVAR: case WEAK: case FOREIGN: @@ -870,10 +881,14 @@ heapCensusChain( Census *census, bdescr *bd ) size = sizeofW(StgHeader) + MIN_UPD_SIZE; break; + case AP: case PAP: - case AP_UPD: size = pap_sizeW((StgPAP *)p); break; + + case AP_STACK: + size = ap_stack_sizeW((StgAP_STACK *)p); + break; case ARR_WORDS: prim = rtsTrue; @@ -888,9 +903,20 @@ heapCensusChain( Census *census, bdescr *bd ) case TSO: prim = rtsTrue; +#ifdef DEBUG_HEAP_PROF size = tso_sizeW((StgTSO *)p); break; - +#else + if (RtsFlags.ProfFlags.includeTSOs) { + size = tso_sizeW((StgTSO *)p); + break; + } else { + // Skip this TSO and move on to the next object + p += tso_sizeW((StgTSO *)p); + continue; + } +#endif + default: barf("heapCensus"); } @@ -985,8 +1011,14 @@ heapCensus( void ) stat_startHeapCensus(); #endif - // traverse the heap, collecting the census info + // Traverse the heap, collecting the census info + + // First the small_alloc_list: we have to fix the free pointer at + // the end by calling tidyAllocatedLists() first. + tidyAllocateLists(); heapCensusChain( census, small_alloc_list ); + + // Now traverse the heap in each generation/step. if (RtsFlags.GcFlags.generations == 1) { heapCensusChain( census, g0s0->to_blocks ); } else { @@ -995,7 +1027,7 @@ heapCensus( void ) heapCensusChain( census, generations[g].steps[s].blocks ); // Are we interested in large objects? might be // confusing to include the stack in a heap profile. - // heapCensusChain( census, generations[g].steps[s].large_objects ); + heapCensusChain( census, generations[g].steps[s].large_objects ); } } }