X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfiling.c;h=c5baff0107d281cbcad7360e5b6d84da2eb64439;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=da6ad0beff888e13b855b88621820e2f5703184e;hpb=9469779a0b2d08d2c4cbf11d90fe31d600a5f683;p=ghc-hetmet.git diff --git a/ghc/rts/Profiling.c b/ghc/rts/Profiling.c index da6ad0b..c5baff0 100644 --- a/ghc/rts/Profiling.c +++ b/ghc/rts/Profiling.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Profiling.c,v 1.26 2001/11/22 16:33:06 simonmar Exp $ + * $Id: Profiling.c,v 1.36 2003/02/22 04:51:52 sof Exp $ * * (c) The GHC Team, 1998-2000 * @@ -16,12 +16,14 @@ #include "Profiling.h" #include "Storage.h" #include "Proftimer.h" -#include "Itimer.h" +#include "Timer.h" #include "ProfHeap.h" #include "Arena.h" #include "RetainerProfile.h" #include "LdvProfile.h" +#include + /* * Profiling allocation arena. */ @@ -36,24 +38,10 @@ unsigned int CC_ID; unsigned int CCS_ID; unsigned int HP_ID; -/* Table sizes from old profiling system. Not sure if we'll need - * these. - */ -nat time_intervals = 0; -nat earlier_ticks = 0; -nat max_cc_no = 0; -nat max_mod_no = 0; -nat max_grp_no = 0; -nat max_descr_no = 0; -nat max_type_no = 0; - -/* Are we time-profiling? - */ -rtsBool time_profiling = rtsFalse; - /* figures for the profiling report. */ -static lnat total_alloc, total_prof_ticks; +static ullong total_alloc; +static lnat total_prof_ticks; /* Globals for opening the profiling log file(s) */ @@ -143,13 +131,12 @@ static CostCentreStack * ActualPush ( CostCentreStack *, CostCentre * ); static CostCentreStack * IsInIndexTable ( IndexTable *, CostCentre * ); static IndexTable * AddToIndexTable ( IndexTable *, CostCentreStack *, CostCentre *, unsigned int ); +static void ccsSetSelected ( CostCentreStack *ccs ); +static void initTimeProfiling ( void ); +static void initProfilingLogFile( void ); - -static void initTimeProfiling ( void ); -static void initProfilingLogFile( void ); - -static void reportCCS_XML ( CostCentreStack *ccs ); +static void reportCCS_XML ( CostCentreStack *ccs ); /* ----------------------------------------------------------------------------- Initialise the profiling environment @@ -194,15 +181,6 @@ initProfiling1 (void) /* cost centres are registered by the per-module * initialisation code now... */ - - switch (RtsFlags.ProfFlags.doHeapProfile) { - case HEAP_BY_RETAINER: - initRetainerProfiling(); - break; - case HEAP_BY_LDV: - initLdvProfiling(); - break; - } } void @@ -221,7 +199,9 @@ initProfiling2 (void) */ ASSERT(CCS_MAIN->prevStack == 0); CCS_MAIN->root = CC_MAIN; + ccsSetSelected(CCS_MAIN); DecCCS(CCS_MAIN); + for (ccs = CCS_LIST; ccs != CCS_MAIN; ) { next = ccs->prevStack; ccs->prevStack = 0; @@ -238,7 +218,45 @@ initProfiling2 (void) initHeapProfiling(); } } - + +// Decide whether closures with this CCS should contribute to the heap +// profile. +static void +ccsSetSelected( CostCentreStack *ccs ) +{ + if (RtsFlags.ProfFlags.modSelector) { + if (! strMatchesSelector( ccs->cc->module, + RtsFlags.ProfFlags.modSelector ) ) { + ccs->selected = 0; + return; + } + } + if (RtsFlags.ProfFlags.ccSelector) { + if (! strMatchesSelector( ccs->cc->label, + RtsFlags.ProfFlags.ccSelector ) ) { + ccs->selected = 0; + return; + } + } + if (RtsFlags.ProfFlags.ccsSelector) { + CostCentreStack *c; + for (c = ccs; c != NULL; c = c->prevStack) { + if ( strMatchesSelector( c->cc->label, + RtsFlags.ProfFlags.ccsSelector )) { + break; + } + } + if (c == NULL) { + ccs->selected = 0; + return; + } + } + + ccs->selected = 1; + return; +} + + static void initProfilingLogFile(void) { @@ -250,12 +268,9 @@ initProfilingLogFile(void) if ((prof_file = fopen(prof_filename, "w")) == NULL) { fprintf(stderr, "Can't open profiling report file %s\n", prof_filename); RtsFlags.CcFlags.doCostCentres = 0; - // @retainer profiling - // @LDV profiling // The following line was added by Sung; retainer/LDV profiling may need // two output files, i.e., .prof/hp. - if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER || - RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_LDV) + if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER) RtsFlags.ProfFlags.doHeapProfile = 0; return; } @@ -293,8 +308,6 @@ initProfilingLogFile(void) void initTimeProfiling(void) { - time_profiling = rtsTrue; - /* Start ticking */ startProfTimer(); }; @@ -469,6 +482,9 @@ ActualPush_ ( CostCentreStack *ccs, CostCentre *cc, CostCentreStack *new_ccs ) new_ccs->root = ccs->root; + // Set the selected field. + ccsSetSelected(new_ccs); + /* update the memoization table for the parent stack */ if (ccs != EMPTY_STACK) ccs->indexTable = AddToIndexTable(ccs->indexTable, new_ccs, cc, @@ -630,7 +646,7 @@ report_per_cc_costs( void ) } } - fprintf(prof_file, "%-20s %-10s", "COST CENTRE", "MODULE"); + fprintf(prof_file, "%-30s %-20s", "COST CENTRE", "MODULE"); fprintf(prof_file, "%6s %6s", "%time", "%alloc"); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { fprintf(prof_file, " %5s %9s", "ticks", "bytes"); @@ -641,7 +657,7 @@ report_per_cc_costs( void ) if (cc_to_ignore(cc)) { continue; } - fprintf(prof_file, "%-20s %-10s", cc->label, cc->module); + fprintf(prof_file, "%-30s %-20s", cc->label, cc->module); fprintf(prof_file, "%6.1f %6.1f", total_prof_ticks == 0 ? 0.0 : (cc->time_ticks / (StgFloat) total_prof_ticks * 100), total_alloc == 0 ? 0.0 : (cc->mem_alloc / (StgFloat) @@ -664,10 +680,10 @@ report_per_cc_costs( void ) static void fprint_header( void ) { - fprintf(prof_file, "%-24s %-10s individual inherited\n", "", ""); + fprintf(prof_file, "%-24s %-10s individual inherited\n", "", ""); - fprintf(prof_file, "%-24s %-10s", "COST CENTRE", "MODULE"); - fprintf(prof_file, "%8s %5s %5s %5s %5s", "entries", "%time", "%alloc", "%time", "%alloc"); + fprintf(prof_file, "%-24s %-50s", "COST CENTRE", "MODULE"); + fprintf(prof_file, "%6s %10s %5s %5s %5s %5s", "no.", "entries", "%time", "%alloc", "%time", "%alloc"); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { fprintf(prof_file, " %5s %9s", "ticks", "bytes"); @@ -681,7 +697,7 @@ fprint_header( void ) } void -report_ccs_profiling( void ) +reportCCSProfiling( void ) { nat count; char temp[128]; /* sigh: magic constant */ @@ -699,6 +715,7 @@ report_ccs_profiling( void ) gen_XML_logfile(); return; default: + break; } fprintf(prof_file, "\t%s Time and Allocation Profiling Report (%s)\n", @@ -719,9 +736,8 @@ report_ccs_profiling( void ) total_prof_ticks, TICK_MILLISECS); fprintf(prof_file, "\ttotal alloc = %11s bytes", - ullong_format_string((ullong) total_alloc * sizeof(W_), + ullong_format_string(total_alloc * sizeof(W_), temp, rtsTrue/*commas*/)); - /* ToDo: 64-bit error! */ #if defined(PROFILING_DETAIL_COUNTS) fprintf(prof_file, " (%lu closures)", total_allocs); @@ -734,12 +750,6 @@ report_ccs_profiling( void ) fprint_header(); reportCCS(pruneCCSTree(CCS_MAIN), 0); - - // @retainer profiling - // @LDV profiling - // Now, prof_file is closed in shutdownHaskell() because this file - // is also used for retainer/LDV profiling. See shutdownHaskell(). - // fclose(prof_file); } static void @@ -757,15 +767,15 @@ reportCCS(CostCentreStack *ccs, nat indent) /* force printing of *all* cost centres if -P -P */ { - fprintf(prof_file, "%-*s%-*s %-10s", + fprintf(prof_file, "%-*s%-*s %-50s", indent, "", 24-indent, cc->label, cc->module); - fprintf(prof_file, "%8lld %5.1f %5.1f %5.1f %5.1f", - ccs->scc_count, - total_prof_ticks == 0 ? 0.0 : (ccs->time_ticks / (StgFloat) total_prof_ticks * 100), - total_alloc == 0 ? 0.0 : (ccs->mem_alloc / (StgFloat) total_alloc * 100), - total_prof_ticks == 0 ? 0.0 : (ccs->inherited_ticks / (StgFloat) total_prof_ticks * 100), - total_alloc == 0 ? 0.0 : (ccs->inherited_alloc / (StgFloat) total_alloc * 100) + fprintf(prof_file, "%6d %11.0f %5.1f %5.1f %5.1f %5.1f", + ccs->ccsID, (double) ccs->scc_count, + total_prof_ticks == 0 ? 0.0 : ((double)ccs->time_ticks / (double)total_prof_ticks * 100.0), + total_alloc == 0 ? 0.0 : ((double)ccs->mem_alloc / (double)total_alloc * 100.0), + total_prof_ticks == 0 ? 0.0 : ((double)ccs->inherited_ticks / (double)total_prof_ticks * 100.0), + total_alloc == 0 ? 0.0 : ((double)ccs->inherited_alloc / (double)total_alloc * 100.0) ); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) {