Skip to content

GitLab

Commit 462bf5ba authored by simonmar's avatar simonmar
Browse files

[project @ 2000-02-17 17:19:42 by simonmar] 

Fitst cut at XML-style profiling logs.  Time/allocation profiling only
for now, and the new flag '+RTS -px' enables the new log file format.
parent 48eec568
Hide whitespace changes
Inline Side-by-side
ghc/rts/ProfHeap.c
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: ProfHeap.c,v 1.2 1999/09/16 12:29:55 simonmar Exp $
* $Id: ProfHeap.c,v 1.3 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -52,15 +52,6 @@ initHeapProfiling(void)
return 0;
}
sprintf(prof_filename, "%.124s.hp", prog_argv[0]);
prof_file = fopen(prof_filename, "w");
if (prof_file == NULL) {
fprintf(stderr, "Can't open heap profiling log file %s\n",
prof_filename);
return 1;
}
fprintf(prof_file, "JOB \"%s\"\n", prog_argv[0]);
fprintf(prof_file, "DATE \"%s\"\n", time_str());
......
ghc/rts/ProfRts.h
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: ProfRts.h,v 1.7 1999/12/03 15:55:29 chak Exp $
* $Id: ProfRts.h,v 1.8 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -14,6 +14,7 @@ void endProfiling ( void );
#ifdef PROFILING
void gen_XML_logfile ( void );
void report_ccs_profiling ( void );
void heap_profile_finish (void);
......
ghc/rts/Profiling.c
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: Profiling.c,v 1.11 1999/11/04 10:15:50 simonmar Exp $
* $Id: Profiling.c,v 1.12 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -62,7 +62,6 @@ CostCentreStack *CCCS;
*/
CostCentre *CC_LIST;
CostCentreStack *CCS_LIST;
CCSDecList *New_CCS_LIST;
/*
* Built-in cost centres and cost-centre stacks:
......@@ -104,6 +103,16 @@ CCS_DECLARE(CCS_OVERHEAD, CC_OVERHEAD, CC_IS_CAF, );
CCS_DECLARE(CCS_SUBSUMED, CC_SUBSUMED, CC_IS_SUBSUMED, );
CCS_DECLARE(CCS_DONTZuCARE, CC_DONTZuCARE, CC_IS_BORING, );
/*
* Uniques for the XML log-file format
*/
#define CC_UQ 1
#define CCS_UQ 2
#define TC_UQ 3
#define HEAP_OBJ_UQ 4
#define TIME_UPD_UQ 5
#define HEAP_UPD_UQ 6
/*
* Static Functions
*/
......@@ -121,6 +130,9 @@ static CostCentreStack *pruneCCSTree ( CostCentreStack *ccs );
static void printCCS ( CostCentreStack *ccs );
#endif
static void initTimeProfiling ( void );
static void initProfilingLogFile( void );
static void reportCCS_XML ( CostCentreStack *ccs );
/* -----------------------------------------------------------------------------
Initialise the profiling environment
......@@ -135,9 +147,9 @@ initProfiling (void)
CCCS = CCS_SYSTEM;
/* Initialize counters for IDs */
CC_ID = 0;
CCS_ID = 0;
HP_ID = 0;
CC_ID = 1;
CCS_ID = 1;
HP_ID = 1;
/* Initialize Declaration lists to NULL */
CC_LIST = NULL;
......@@ -163,11 +175,17 @@ initProfiling (void)
registerCostCentres();
CCCS = CCS_SYSTEM;
/* Set up the log file, and dump the header and cost centre
* information into it.
*/
initProfilingLogFile();
/* find all the "special" cost centre stacks, and make them children
* of CCS_MAIN.
*/
ASSERT(CCS_MAIN->prevStack == 0);
CCS_MAIN->root = CC_MAIN;
DecCCS(CCS_MAIN);
for (ccs = CCS_LIST; ccs != CCS_MAIN; ) {
next = ccs->prevStack;
ccs->prevStack = 0;
......@@ -185,15 +203,41 @@ initProfiling (void)
}
}
void
initTimeProfiling(void)
static void
initProfilingLogFile(void)
{
time_profiling = rtsTrue;
/* Initialise the log file name */
prof_filename = stgMallocBytes(strlen(prog_argv[0]) + 6, "initProfiling");
sprintf(prof_filename, "%s.prof", prog_argv[0]);
/* open the log file */
if ((prof_file = fopen(prof_filename, "w")) == NULL) {
fprintf(stderr, "Can't open profiling report file %s\n", prof_filename);
RtsFlags.CcFlags.doCostCentres = 0;
return;
}
if (RtsFlags.CcFlags.doCostCentres == COST_CENTRES_XML) {
/* dump the time, and the profiling interval */
fprintf(prof_file, "\"%s\"\n", time_str());
fprintf(prof_file, "\"%d ms\"\n", TICK_MILLISECS);
/* declare all the cost centres */
{
CostCentre *cc;
for (cc = CC_LIST; cc != NULL; cc = cc->link) {
fprintf(prof_file, "%d %d \"%s\" \"%s\" \"%s\"\n",
CC_UQ, cc->ccID, cc->label, cc->module, cc->group);
}
}
}
}
void
initTimeProfiling(void)
{
time_profiling = rtsTrue;
/* Start ticking */
startProfTimer();
};
......@@ -340,7 +384,7 @@ AppendCCS ( CostCentreStack *ccs1, CostCentreStack *ccs2 )
CostCentreStack *
AppendCCS ( CostCentreStack *ccs1, CostCentreStack *ccs2 )
{
CostCentreStack *ccs;
CostCentreStack *ccs = NULL;
/* Optimisation: if we attempt to append a CCS to itself, we're
* going to end up with the same ccs after a great deal of pushing
......@@ -491,23 +535,20 @@ print_ccs (FILE *fp, CostCentreStack *ccs)
static void
DecCCS(CostCentreStack *ccs)
{
CCSDecList *temp_list;
temp_list =
(CCSDecList *) stgMallocBytes(sizeof(CCSDecList),
"Error allocating space for CCSDecList");
temp_list->ccs = ccs;
temp_list->nextList = New_CCS_LIST;
New_CCS_LIST = temp_list;
if (prof_file && RtsFlags.CcFlags.doCostCentres == COST_CENTRES_XML) {
if (ccs->prevStack == EMPTY_STACK)
fprintf(prof_file, "%d %d 1 %d\n", CCS_UQ,
ccs->ccsID, ccs->cc->ccID);
else
fprintf(prof_file, "%d %d 2 %d %d\n", CCS_UQ,
ccs->ccsID, ccs->cc->ccID, ccs->prevStack->ccsID);
}
}
/* -----------------------------------------------------------------------------
Generating a time & allocation profiling report.
-------------------------------------------------------------------------- */
static FILE *prof_file;
/* -----------------------------------------------------------------------------
Generating the aggregated per-cost-centre time/alloc report.
-------------------------------------------------------------------------- */
......@@ -622,20 +663,21 @@ report_ccs_profiling( void )
rtsBool do_groups = rtsFalse;
#endif
if (!RtsFlags.CcFlags.doCostCentres)
return;
stopProfTimer();
total_prof_ticks = 0;
total_alloc = 0;
count_ticks(CCS_MAIN);
/* open profiling output file */
if ((prof_file = fopen(prof_filename, "w")) == NULL) {
fprintf(stderr, "Can't open profiling report file %s\n", prof_filename);
return;
switch (RtsFlags.CcFlags.doCostCentres) {
case 0:
return;
case COST_CENTRES_XML:
gen_XML_logfile();
return;
default:
}
fprintf(prof_file, "\t%s Time and Allocation Profiling Report (%s)\n",
time_str(), "Final");
......@@ -784,6 +826,38 @@ pruneCCSTree( CostCentreStack *ccs )
}
}
/* -----------------------------------------------------------------------------
Generate the XML time/allocation profile
-------------------------------------------------------------------------- */
void
gen_XML_logfile( void )
{
fprintf(prof_file, "%d %lu", TIME_UPD_UQ, total_prof_ticks);
reportCCS_XML(pruneCCSTree(CCS_MAIN));
fprintf(prof_file, " 0\n");
fclose(prof_file);
}
static void
reportCCS_XML(CostCentreStack *ccs)
{
CostCentre *cc;
IndexTable *i;
cc = ccs->cc;
fprintf(prof_file, " 1 %d %lu %lu %lu",
ccs->ccsID, ccs->scc_count, ccs->time_ticks, ccs->mem_alloc);
for (i = ccs->indexTable; i != 0; i = i->next) {
reportCCS_XML(i->ccs);
}
}
#ifdef DEBUG
static void
printCCS ( CostCentreStack *ccs )
......
ghc/rts/RtsFlags.c
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: RtsFlags.c,v 1.25 2000/02/17 14:15:10 simonmar Exp $
* $Id: RtsFlags.c,v 1.26 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The AQUA Project, Glasgow University, 1994-1997
* (c) The GHC Team, 1998-1999
......@@ -200,7 +200,6 @@ void initRtsFlagsDefaults(void)
#if defined(PROFILING) || defined(PAR)
RtsFlags.CcFlags.doCostCentres = 0;
RtsFlags.CcFlags.sortBy = SORTCC_TIME;
#endif /* PROFILING or PAR */
#ifdef PROFILING
......@@ -697,20 +696,16 @@ error = rtsTrue;
case 'P': /* detailed cost centre profiling (time/alloc) */
COST_CENTRE_USING_BUILD_ONLY(
RtsFlags.CcFlags.doCostCentres++;
RtsFlags.CcFlags.doCostCentres = COST_CENTRES_VERBOSE;
)
case 'p': /* cost centre profiling (time/alloc) */
COST_CENTRE_USING_BUILD_ONLY(
RtsFlags.CcFlags.doCostCentres++;
switch (rts_argv[arg][2]) {
case SORTCC_LABEL:
case SORTCC_TIME:
case SORTCC_ALLOC:
RtsFlags.CcFlags.sortBy = rts_argv[arg][2];
case 'x':
RtsFlags.CcFlags.doCostCentres = COST_CENTRES_XML;
break;
default:
RtsFlags.CcFlags.sortBy = SORTCC_TIME;
RtsFlags.CcFlags.doCostCentres = COST_CENTRES_SUMMARY;
break;
}
) break;
......
ghc/rts/RtsFlags.h
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: RtsFlags.h,v 1.20 2000/01/13 14:34:04 hwloidl Exp $
* $Id: RtsFlags.h,v 1.21 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -72,11 +72,7 @@ struct COST_CENTRE_FLAGS {
# define COST_CENTRES_SUMMARY 1
# define COST_CENTRES_VERBOSE 2 /* incl. serial time profile */
# define COST_CENTRES_ALL 3
char sortBy;
# define SORTCC_LABEL 'C'
# define SORTCC_TIME 'T'
# define SORTCC_ALLOC 'A'
# define COST_CENTRES_XML 4
int ctxtSwitchTicks; /* derived */
int profilerTicks; /* derived */
......
ghc/rts/RtsStartup.c
View file @ 462bf5ba
/* -----------------------------------------------------------------------------
* $Id: RtsStartup.c,v 1.28 2000/02/07 20:57:58 simonmar Exp $
* $Id: RtsStartup.c,v 1.29 2000/02/17 17:19:42 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
......@@ -224,7 +224,7 @@ shutdownHaskell(void)
#endif
#if defined(PROFILING)
report_ccs_profiling( );
report_ccs_profiling();
#endif
#if defined(TICKY_TICKY)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment