X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStats.c;h=4920b4b88f0cd50f430b475f945be6dbbd88c229;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=47b050d71dd41a9e508608ffae959fa5960eb7bb;hpb=abbb320e7b8e07c680b7d6ca556576b4d030b6d0;p=ghc-hetmet.git diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c index 47b050d..4920b4b 100644 --- a/ghc/rts/Stats.c +++ b/ghc/rts/Stats.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Stats.c,v 1.33 2001/11/02 11:15:00 simonmar Exp $ + * $Id: Stats.c,v 1.48 2004/08/13 13:10:45 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -14,11 +14,12 @@ #include "Rts.h" #include "RtsFlags.h" #include "RtsUtils.h" -#include "StoragePriv.h" #include "MBlock.h" #include "Schedule.h" #include "Stats.h" -#include "ParTicky.h" // ToDo: move into Rts.h +#include "ParTicky.h" /* ToDo: move into Rts.h */ +#include "Profiling.h" +#include "Storage.h" #ifdef HAVE_UNISTD_H #include @@ -93,12 +94,26 @@ static TICK_TYPE ExitElapsedTime = 0; static ullong GC_tot_alloc = 0; static ullong GC_tot_copied = 0; -static TICK_TYPE GC_start_time, GC_tot_time = 0; /* User GC Time */ -static TICK_TYPE GCe_start_time, GCe_tot_time = 0; /* Elapsed GC time */ +static TICK_TYPE GC_start_time = 0, GC_tot_time = 0; /* User GC Time */ +static TICK_TYPE GCe_start_time = 0, GCe_tot_time = 0; /* Elapsed GC time */ -lnat MaxResidency = 0; /* in words; for stats only */ -lnat AvgResidency = 0; -lnat ResidencySamples = 0; /* for stats only */ +#ifdef PROFILING +static TICK_TYPE RP_start_time = 0, RP_tot_time = 0; /* retainer prof user time */ +static TICK_TYPE RPe_start_time = 0, RPe_tot_time = 0; /* retainer prof elap time */ + +static TICK_TYPE HC_start_time, HC_tot_time = 0; // heap census prof user time +static TICK_TYPE HCe_start_time, HCe_tot_time = 0; // heap census prof elap time +#endif + +#ifdef PROFILING +#define PROF_VAL(x) (x) +#else +#define PROF_VAL(x) 0 +#endif + +static lnat MaxResidency = 0; // in words; for stats only +static lnat AvgResidency = 0; +static lnat ResidencySamples = 0; // for stats only static lnat GC_start_faults = 0, GC_end_faults = 0; @@ -124,24 +139,53 @@ static nat pageFaults(void); static void getTimes(void) { - FILETIME creationTime, exitTime, kernelTime, userTime; + static int is_win9x = -1; + + FILETIME creationTime, exitTime, userTime, kernelTime = {0,0}; long long int kT, uT; + + if (is_win9x < 0) { + /* figure out whether we're on a Win9x box or not. */ + OSVERSIONINFO oi; + BOOL b; + + /* Need to init the size field first.*/ + oi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + b = GetVersionEx(&oi); + + is_win9x = ( (b && (oi.dwPlatformId & VER_PLATFORM_WIN32_WINDOWS)) ? 1 : 0); + } - /* ToDo: pin down elapsed times to just the OS thread(s) that - are evaluating/managing Haskell code. - */ - if (!GetProcessTimes (GetCurrentProcess(), &creationTime, + if (is_win9x) { + /* On Win9x, just attribute all running time to the user. */ + SYSTEMTIME st; + + GetSystemTime(&st); + SystemTimeToFileTime(&st,&userTime); + } else { + /* ToDo: pin down elapsed times to just the OS thread(s) that + are evaluating/managing Haskell code. + */ + if (!GetProcessTimes (GetCurrentProcess(), &creationTime, &exitTime, &kernelTime, &userTime)) { /* Probably on a Win95 box..*/ CurrentElapsedTime = 0; CurrentUserTime = 0; return; + } } FT2longlong(kT,kernelTime); FT2longlong(uT,userTime); CurrentElapsedTime = uT + kT; CurrentUserTime = uT; + + if (is_win9x) { + /* Adjust for the fact that we're using system time & not + process time on Win9x. */ + CurrentUserTime -= ElapsedTimeStart; + CurrentElapsedTime -= ElapsedTimeStart; + } } #else /* !win32 */ @@ -181,18 +225,37 @@ getTimes(void) * stat_startGC() for details) */ double -mut_user_time_during_GC(void) +mut_user_time_during_GC( void ) { - return TICK_TO_DBL(GC_start_time - GC_tot_time); + return TICK_TO_DBL(GC_start_time - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time)); } double -mut_user_time(void) +mut_user_time( void ) { getTimes(); - return TICK_TO_DBL(CurrentUserTime - GC_tot_time); + return TICK_TO_DBL(CurrentUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time)); } +#ifdef PROFILING +/* + mut_user_time_during_RP() is similar to mut_user_time_during_GC(); + it returns the MUT time during retainer profiling. + The same is for mut_user_time_during_HC(); + */ +double +mut_user_time_during_RP( void ) +{ + return TICK_TO_DBL(RP_start_time - GC_tot_time - RP_tot_time - HC_tot_time); +} + +double +mut_user_time_during_heap_census( void ) +{ + return TICK_TO_DBL(HC_start_time - GC_tot_time - RP_tot_time - HC_tot_time); +} +#endif /* PROFILING */ + static nat pageFaults(void) { @@ -291,9 +354,10 @@ stat_startExit(void) { getTimes(); MutElapsedStamp = CurrentElapsedTime; - MutElapsedTime = CurrentElapsedTime - GCe_tot_time - InitElapsedStamp; + MutElapsedTime = CurrentElapsedTime - GCe_tot_time - + PROF_VAL(RPe_tot_time + HCe_tot_time) - InitElapsedStamp; if (MutElapsedTime < 0) { MutElapsedTime = 0; } /* sometimes -0.00 */ - + /* for SMP, we don't know the mutator time yet, we have to inspect * all the running threads to find out, and they haven't stopped * yet. So we just timestamp MutUserTime at this point so we can @@ -303,7 +367,7 @@ stat_startExit(void) #ifdef SMP MutUserTime = CurrentUserTime; #else - MutUserTime = CurrentUserTime - GC_tot_time - InitUserTime; + MutUserTime = CurrentUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; if (MutUserTime < 0) { MutUserTime = 0; } #endif } @@ -315,7 +379,7 @@ stat_endExit(void) #ifdef SMP ExitUserTime = CurrentUserTime - MutUserTime; #else - ExitUserTime = CurrentUserTime - MutUserTime - GC_tot_time - InitUserTime; + ExitUserTime = CurrentUserTime - MutUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; #endif ExitElapsedTime = CurrentElapsedTime - MutElapsedStamp; if (ExitUserTime < 0) { @@ -442,23 +506,92 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) } /* ----------------------------------------------------------------------------- + Called at the beginning of each Retainer Profiliing + -------------------------------------------------------------------------- */ +#ifdef PROFILING +void +stat_startRP(void) +{ + getTimes(); + RP_start_time = CurrentUserTime; + RPe_start_time = CurrentElapsedTime; +} +#endif /* PROFILING */ + +/* ----------------------------------------------------------------------------- + Called at the end of each Retainer Profiliing + -------------------------------------------------------------------------- */ + +#ifdef PROFILING +void +stat_endRP( + nat retainerGeneration, +#ifdef DEBUG_RETAINER + nat maxCStackSize, + int maxStackSize, +#endif + double averageNumVisit) +{ + getTimes(); + RP_tot_time += CurrentUserTime - RP_start_time; + RPe_tot_time += CurrentElapsedTime - RPe_start_time; + + fprintf(prof_file, "Retainer Profiling: %d, at %f seconds\n", + retainerGeneration, mut_user_time_during_RP()); +#ifdef DEBUG_RETAINER + fprintf(prof_file, "\tMax C stack size = %u\n", maxCStackSize); + fprintf(prof_file, "\tMax auxiliary stack size = %u\n", maxStackSize); +#endif + fprintf(prof_file, "\tAverage number of visits per object = %f\n", averageNumVisit); +} +#endif /* PROFILING */ + +/* ----------------------------------------------------------------------------- + Called at the beginning of each heap census + -------------------------------------------------------------------------- */ +#ifdef PROFILING +void +stat_startHeapCensus(void) +{ + getTimes(); + HC_start_time = CurrentUserTime; + HCe_start_time = CurrentElapsedTime; +} +#endif /* PROFILING */ + +/* ----------------------------------------------------------------------------- + Called at the end of each heap census + -------------------------------------------------------------------------- */ +#ifdef PROFILING +void +stat_endHeapCensus(void) +{ + getTimes(); + HC_tot_time += CurrentUserTime - HC_start_time; + HCe_tot_time += CurrentElapsedTime - HCe_start_time; +} +#endif /* PROFILING */ + +/* ----------------------------------------------------------------------------- stat_workerStop Called under SMP when a worker thread finishes. We drop the timing stats for this thread into the task_ids struct for that thread. -------------------------------------------------------------------------- */ -#ifdef SMP +#if defined(SMP) void stat_workerStop(void) { nat i; pthread_t me = pthread_self(); + getTimes(); + for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) { if (task_ids[i].id == me) { - task_ids[i].mut_time = usertime() - task_ids[i].gc_time; - task_ids[i].mut_etime = elapsedtime() + task_ids[i].mut_time = CurrentUserTime - task_ids[i].gc_time; + task_ids[i].mut_etime = CurrentElapsedTime - GCe_tot_time - task_ids[i].elapsedtimestart; if (task_ids[i].mut_time < 0.0) { task_ids[i].mut_time = 0.0; } @@ -468,6 +601,14 @@ stat_workerStop(void) } #endif +#if defined(SMP) +long int stat_getElapsedTime () +{ + getTimes(); + return CurrentElapsedTime; +} +#endif + /* ----------------------------------------------------------------------------- Called at the end of execution @@ -569,28 +710,37 @@ stat_exit(int alloc) TICK_TO_DBL(MutUserTime), TICK_TO_DBL(MutElapsedTime)); fprintf(sf, " GC time %6.2fs (%6.2fs elapsed)\n", TICK_TO_DBL(GC_tot_time), TICK_TO_DBL(GCe_tot_time)); +#ifdef PROFILING + fprintf(sf, " RP time %6.2fs (%6.2fs elapsed)\n", + TICK_TO_DBL(RP_tot_time), TICK_TO_DBL(RPe_tot_time)); + fprintf(sf, " PROF time %6.2fs (%6.2fs elapsed)\n", + TICK_TO_DBL(HC_tot_time), TICK_TO_DBL(HCe_tot_time)); +#endif fprintf(sf, " EXIT time %6.2fs (%6.2fs elapsed)\n", TICK_TO_DBL(ExitUserTime), TICK_TO_DBL(ExitElapsedTime)); fprintf(sf, " Total time %6.2fs (%6.2fs elapsed)\n\n", TICK_TO_DBL(time), TICK_TO_DBL(etime)); fprintf(sf, " %%GC time %5.1f%% (%.1f%% elapsed)\n\n", TICK_TO_DBL(GC_tot_time)*100/TICK_TO_DBL(time), - TICK_TO_DBL(GCe_tot_time)*100/TIC_TO_DBL(etime)); + TICK_TO_DBL(GCe_tot_time)*100/TICK_TO_DBL(etime)); - if (time - GC_tot_time == 0) + if (time - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) == 0) ullong_format_string(0, temp, rtsTrue/*commas*/); else ullong_format_string( (ullong)((GC_tot_alloc*sizeof(W_))/ - TICK_TO_DBL(time - GC_tot_time)), + TICK_TO_DBL(time - GC_tot_time - + PROF_VAL(RP_tot_time + HC_tot_time))), temp, rtsTrue/*commas*/); fprintf(sf, " Alloc rate %s bytes per MUT second\n\n", temp); fprintf(sf, " Productivity %5.1f%% of total user, %.1f%% of total elapsed\n\n", - TICK_TO_DBL(time - GC_tot_time - InitUserTime) * 100 + TICK_TO_DBL(time - GC_tot_time - + PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime) * 100 / TICK_TO_DBL(time), - TICK_TO_DBL(time - GC_tot_time - InitUserTime) * 100 + TICK_TO_DBL(time - GC_tot_time - + PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime) * 100 / TICK_TO_DBL(etime)); } @@ -599,7 +749,8 @@ stat_exit(int alloc) fprintf(sf, "<>\n", total_collections, - AvgResidency*sizeof(W_)/ResidencySamples, + ResidencySamples == 0 ? 0 : + AvgResidency*sizeof(W_)/ResidencySamples, MaxResidency*sizeof(W_), ResidencySamples, (unsigned long)(mblocks_allocated * MBLOCK_SIZE / (1024L * 1024L)), @@ -609,7 +760,9 @@ stat_exit(int alloc) } fflush(sf); - fclose(sf); + if (sf != stderr) { + fclose(sf); + } } } @@ -618,6 +771,7 @@ stat_exit(int alloc) Produce some detailed info on the state of the generational GC. -------------------------------------------------------------------------- */ +#ifdef DEBUG void statDescribeGens(void) { @@ -660,11 +814,12 @@ statDescribeGens(void) } fprintf(stderr,"\n"); } +#endif /* ----------------------------------------------------------------------------- Stats available via a programmatic interface, so eg. GHCi can time each compilation and expression evaluation. -------------------------------------------------------------------------- */ -extern HsInt getAllocations( void ) -{ return (HsInt)(total_allocated * sizeof(W_)); } +extern HsInt64 getAllocations( void ) +{ return (HsInt64)total_allocated * sizeof(W_); }