X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfHeap.c;h=837591bf46e6a28b5dfb6de9389befd6dee31346;hb=272a418428beede04a9c4ae027474878c59d6ca1;hp=51fa3df79a1b3bdafc9cae33a2a4136dcba20f95;hpb=51a1c2a2de6d85ae990a405408040be56b0c50a9;p=ghc-hetmet.git diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c index 51fa3df..837591b 100644 --- a/ghc/rts/ProfHeap.c +++ b/ghc/rts/ProfHeap.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- - * $Id: ProfHeap.c,v 1.43 2003/02/20 15:39:59 simonmar Exp $ + * $Id: ProfHeap.c,v 1.50 2003/11/12 17:49:08 sof Exp $ * - * (c) The GHC Team, 1998-2000 + * (c) The GHC Team, 1998-2003 * * Support for heap profiling * @@ -72,7 +72,7 @@ typedef struct _counter { struct _counter *next; } counter; -static inline void +STATIC_INLINE void initLDVCtr( counter *ctr ) { ctr->c.ldv.prim = 0; @@ -177,7 +177,7 @@ static char *type_names[] = { * the band to which this closure's heap space is attributed in the * heap profile. * ------------------------------------------------------------------------- */ -static inline void * +STATIC_INLINE void * closureIdentity( StgClosure *p ) { switch (RtsFlags.ProfFlags.doHeapProfile) { @@ -215,14 +215,14 @@ closureIdentity( StgClosure *p ) * Profiling type predicates * ----------------------------------------------------------------------- */ #ifdef PROFILING -static inline rtsBool +STATIC_INLINE rtsBool doingLDVProfiling( void ) { return (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_LDV || RtsFlags.ProfFlags.bioSelector != NULL); } -static inline rtsBool +STATIC_INLINE rtsBool doingRetainerProfiling( void ) { return (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER @@ -304,7 +304,7 @@ LDV_recordDead( StgClosure *c, nat size ) /* -------------------------------------------------------------------------- * Initialize censuses[era]; * ----------------------------------------------------------------------- */ -static inline void +STATIC_INLINE void initEra(Census *census) { census->hash = allocHashTable(); @@ -351,6 +351,7 @@ nextEra( void ) #ifdef DEBUG_HEAP_PROF FILE *hp_file; +static char *hp_filename; void initProfiling1( void ) { @@ -358,6 +359,20 @@ void initProfiling1( void ) void initProfiling2( void ) { + if (RtsFlags.ProfFlags.doHeapProfile) { + /* Initialise the log file name */ + hp_filename = stgMallocBytes(strlen(prog_name) + 6, "hpFileName"); + sprintf(hp_filename, "%s.hp", prog_name); + + /* open the log file */ + if ((hp_file = fopen(hp_filename, "w")) == NULL) { + fprintf(stderr, "Can't open profiling report file %s\n", + hp_filename); + RtsFlags.ProfFlags.doHeapProfile = 0; + return; + } + } + initHeapProfiling(); } @@ -407,7 +422,8 @@ initHeapProfiling(void) initEra( &censuses[era] ); - fprintf(hp_file, "JOB \"%s", prog_argv[0]); + /* initProfilingLogFile(); */ + fprintf(hp_file, "JOB \"%s", prog_name); #ifdef PROFILING { @@ -432,7 +448,7 @@ initHeapProfiling(void) fprintf(hp_file, "END_SAMPLE 0.00\n"); #ifdef DEBUG_HEAP_PROF - DEBUG_LoadSymbols(prog_argv[0]); + DEBUG_LoadSymbols(prog_name); #endif #ifdef PROFILING @@ -479,13 +495,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) { @@ -495,6 +522,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) { @@ -502,31 +532,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 { @@ -826,6 +841,15 @@ heapCensusChain( Census *census, bdescr *bd ) rtsBool prim; for (; bd != NULL; bd = bd->link) { + + // HACK: ignore pinned blocks, because they contain gaps. + // It's not clear exactly what we'd like to do here, since we + // can't tell which objects in the block are actually alive. + // Perhaps the whole block should be counted as SYSTEM memory. + if (bd->flags & BF_PINNED) { + continue; + } + p = bd->start; while (p < bd->free) { info = get_itbl((StgClosure *)p); @@ -837,6 +861,7 @@ heapCensusChain( Census *census, bdescr *bd ) case FUN: case THUNK: case IND_PERM: + case IND_OLDGEN: case IND_OLDGEN_PERM: case CAF_BLACKHOLE: case SE_CAF_BLACKHOLE: @@ -862,6 +887,10 @@ heapCensusChain( Census *census, bdescr *bd ) break; case BCO: + prim = rtsTrue; + size = bco_sizeW((StgBCO *)p); + break; + case MVAR: case WEAK: case FOREIGN: