X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStats.c;h=7c1dbaf946b199d98a5b3d4f01c2d75d24769c73;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=523622d19494adde51817befdf8dc5e229e0ba56;hpb=70d0bbbc0acb21e51cc88d0c6d496d3915f7077e;p=ghc-hetmet.git diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c index 523622d..7c1dbaf 100644 --- a/ghc/rts/Stats.c +++ b/ghc/rts/Stats.c @@ -1,7 +1,6 @@ /* ----------------------------------------------------------------------------- - * $Id: Stats.c,v 1.34 2001/11/05 05:12:55 sof Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2004 * * Statistics and timing-related functions. * @@ -14,17 +13,18 @@ #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 #endif -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS # ifdef HAVE_SYS_TIMES_H # include # endif @@ -40,7 +40,7 @@ # endif #endif -#if ! irix_TARGET_OS && ! defined(mingw32_TARGET_OS) +#if ! irix_HOST_OS && ! defined(mingw32_HOST_OS) # if defined(HAVE_SYS_RESOURCE_H) # include # endif @@ -58,7 +58,7 @@ #include #endif -#if defined(PAR) || !(!defined(HAVE_GETRUSAGE) || irix_TARGET_OS || defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS)) +#if defined(PAR) || !(!defined(HAVE_GETRUSAGE) || irix_HOST_OS || defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS)) #include #endif @@ -93,12 +93,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; @@ -107,9 +121,13 @@ static TICK_TYPE *GC_coll_times; static void getTimes(void); static nat pageFaults(void); +static void statsPrintf( char *s, ... ); +static void statsFlush( void ); +static void statsClose( void ); + /* elapsedtime() -- The current elapsed time in seconds */ -#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) +#if defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) #define HNS_PER_SEC 10000000LL /* FILETIMES are in units of 100ns */ /* Convert FILETIMEs into secs */ #define FT2longlong(ll,ft) \ @@ -119,29 +137,58 @@ static nat pageFaults(void); (ll) /= (unsigned long long) (HNS_PER_SEC / CLOCKS_PER_SEC) #endif -#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) +#if defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) /* cygwin32 or mingw32 version */ 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 */ @@ -154,7 +201,7 @@ getTimes(void) /* We will #ifdef around the fprintf for machines we *know* are unsupported. (WDP 94/05) */ - fprintf(stderr, "NOTE: `getTimes' does nothing!\n"); + debugBelch("NOTE: `getTimes' does nothing!\n"); return 0.0; #else /* not stumped */ @@ -181,24 +228,43 @@ 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) { /* ToDo (on NT): better, get this via the performance data that's stored in the registry. */ -# if !defined(HAVE_GETRUSAGE) || irix_TARGET_OS || defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) +# if !defined(HAVE_GETRUSAGE) || irix_HOST_OS || defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) return 0; # else struct rusage t; @@ -212,11 +278,10 @@ void initStats(void) { nat i; - FILE *sf = RtsFlags.GcFlags.statsFile; if (RtsFlags.GcFlags.giveStats >= VERBOSE_GC_STATS) { - fprintf(sf, " Alloc Collect Live GC GC TOT TOT Page Flts\n"); - fprintf(sf, " bytes bytes bytes user elap user elap\n"); + statsPrintf(" Alloc Collect Live GC GC TOT TOT Page Flts\n"); + statsPrintf(" bytes bytes bytes user elap user elap\n"); } GC_coll_times = (TICK_TYPE *)stgMallocBytes( @@ -243,7 +308,7 @@ stat_startInit(void) ticks = sysconf(_SC_CLK_TCK); if ( ticks == -1 ) { - fprintf(stderr, "stat_init: bad call to 'sysconf'!\n"); + debugBelch("stat_init: bad call to 'sysconf'!\n"); stg_exit(EXIT_FAILURE); } TicksPerSecond = ticks; @@ -259,7 +324,7 @@ stat_startInit(void) /* We will #ifdef around the fprintf for machines we *know* are unsupported. (WDP 94/05) */ - fprintf(stderr, "NOTE: Guessing `TicksPerSecond = 60'!\n"); + debugBelch("NOTE: Guessing `TicksPerSecond = 60'!\n"); TicksPerSecond = 60; #endif @@ -291,9 +356,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 +369,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 +381,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) { @@ -344,10 +410,10 @@ stat_startGC(void) if (bell) { if (bell > 1) { - fprintf(stderr, " GC "); + debugBelch(" GC "); rub_bell = 1; } else { - fprintf(stderr, "\007"); + debugBelch("\007"); } } @@ -375,8 +441,6 @@ stat_startGC(void) void stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) { - FILE *sf = RtsFlags.GcFlags.statsFile; - if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { TICK_TYPE time, etime, gc_time, gc_etime; @@ -386,12 +450,12 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) gc_time = time - GC_start_time; gc_etime = etime - GCe_start_time; - if (RtsFlags.GcFlags.giveStats == VERBOSE_GC_STATS && sf != NULL) { + if (RtsFlags.GcFlags.giveStats == VERBOSE_GC_STATS) { nat faults = pageFaults(); - fprintf(sf, "%9ld %9ld %9ld", + statsPrintf("%9ld %9ld %9ld", alloc*sizeof(W_), collect*sizeof(W_), live*sizeof(W_)); - fprintf(sf, " %5.2f %5.2f %7.2f %7.2f %4ld %4ld (Gen: %2ld)\n", + statsPrintf(" %5.2f %5.2f %7.2f %7.2f %4ld %4ld (Gen: %2ld)\n", TICK_TO_DBL(gc_time), TICK_TO_DBL(gc_etime), TICK_TO_DBL(time), @@ -401,7 +465,7 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) gen); GC_end_faults = faults; - fflush(sf); + statsFlush(); } GC_coll_times[gen] += gc_time; @@ -436,29 +500,98 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) } if (rub_bell) { - fprintf(stderr, "\b\b\b \b\b\b"); + debugBelch("\b\b\b \b\b\b"); rub_bell = 0; } } /* ----------------------------------------------------------------------------- + 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 @@ -479,8 +620,6 @@ stat_workerStop(void) void stat_exit(int alloc) { - FILE *sf = RtsFlags.GcFlags.statsFile; - if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { char temp[BIG_STRING_LEN]; @@ -516,43 +655,43 @@ stat_exit(int alloc) if (MutUserTime < 0) { MutUserTime = 0; } #endif - if (RtsFlags.GcFlags.giveStats >= VERBOSE_GC_STATS && sf != NULL) { - fprintf(sf, "%9ld %9.9s %9.9s", (lnat)alloc*sizeof(W_), "", ""); - fprintf(sf, " %5.2f %5.2f\n\n", 0.0, 0.0); + if (RtsFlags.GcFlags.giveStats >= VERBOSE_GC_STATS) { + statsPrintf("%9ld %9.9s %9.9s", (lnat)alloc*sizeof(W_), "", ""); + statsPrintf(" %5.2f %5.2f\n\n", 0.0, 0.0); } - if (RtsFlags.GcFlags.giveStats >= SUMMARY_GC_STATS && sf != NULL) { + if (RtsFlags.GcFlags.giveStats >= SUMMARY_GC_STATS) { ullong_format_string(GC_tot_alloc*sizeof(W_), temp, rtsTrue/*commas*/); - fprintf(sf, "%11s bytes allocated in the heap\n", temp); + statsPrintf("%11s bytes allocated in the heap\n", temp); ullong_format_string(GC_tot_copied*sizeof(W_), temp, rtsTrue/*commas*/); - fprintf(sf, "%11s bytes copied during GC\n", temp); + statsPrintf("%11s bytes copied during GC\n", temp); if ( ResidencySamples > 0 ) { ullong_format_string(MaxResidency*sizeof(W_), temp, rtsTrue/*commas*/); - fprintf(sf, "%11s bytes maximum residency (%ld sample(s))\n", + statsPrintf("%11s bytes maximum residency (%ld sample(s))\n", temp, ResidencySamples); } - fprintf(sf,"\n"); + statsPrintf("\n"); /* Print garbage collections in each gen */ for (g = 0; g < RtsFlags.GcFlags.generations; g++) { - fprintf(sf, "%11d collections in generation %d (%6.2fs)\n", + statsPrintf("%11d collections in generation %d (%6.2fs)\n", generations[g].collections, g, TICK_TO_DBL(GC_coll_times[g])); } - fprintf(sf,"\n%11ld Mb total memory in use\n\n", + statsPrintf("\n%11ld Mb total memory in use\n\n", mblocks_allocated * MBLOCK_SIZE / (1024 * 1024)); #ifdef SMP { nat i; for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) { - fprintf(sf, " Task %2d: MUT time: %6.2fs (%6.2fs elapsed)\n" + statsPrintf(" Task %2d: MUT time: %6.2fs (%6.2fs elapsed)\n" " GC time: %6.2fs (%6.2fs elapsed)\n\n", i, TICK_TO_DBL(task_ids[i].mut_time), @@ -563,43 +702,53 @@ stat_exit(int alloc) } #endif - fprintf(sf, " INIT time %6.2fs (%6.2fs elapsed)\n", + statsPrintf(" INIT time %6.2fs (%6.2fs elapsed)\n", TICK_TO_DBL(InitUserTime), TICK_TO_DBL(InitElapsedTime)); - fprintf(sf, " MUT time %6.2fs (%6.2fs elapsed)\n", + statsPrintf(" MUT time %6.2fs (%6.2fs elapsed)\n", TICK_TO_DBL(MutUserTime), TICK_TO_DBL(MutElapsedTime)); - fprintf(sf, " GC time %6.2fs (%6.2fs elapsed)\n", + statsPrintf(" GC time %6.2fs (%6.2fs elapsed)\n", TICK_TO_DBL(GC_tot_time), TICK_TO_DBL(GCe_tot_time)); - fprintf(sf, " EXIT time %6.2fs (%6.2fs elapsed)\n", +#ifdef PROFILING + statsPrintf(" RP time %6.2fs (%6.2fs elapsed)\n", + TICK_TO_DBL(RP_tot_time), TICK_TO_DBL(RPe_tot_time)); + statsPrintf(" PROF time %6.2fs (%6.2fs elapsed)\n", + TICK_TO_DBL(HC_tot_time), TICK_TO_DBL(HCe_tot_time)); +#endif + statsPrintf(" 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", + statsPrintf(" 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", + statsPrintf(" %%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/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); + statsPrintf(" 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 + statsPrintf(" Productivity %5.1f%% of total user, %.1f%% of total elapsed\n\n", + 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)); } - if (RtsFlags.GcFlags.giveStats == ONELINE_GC_STATS && sf != NULL) { + if (RtsFlags.GcFlags.giveStats == ONELINE_GC_STATS) { /* print the long long separately to avoid bugginess on mingwin (2001-07-02, mingw-0.5) */ - fprintf(sf, "<>\n", + statsPrintf("<>\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)), @@ -608,8 +757,8 @@ stat_exit(int alloc) TICK_TO_DBL(GC_tot_time), TICK_TO_DBL(GCe_tot_time)); } - fflush(sf); - fclose(sf); + statsFlush(); + statsClose(); } } @@ -618,6 +767,7 @@ stat_exit(int alloc) Produce some detailed info on the state of the generational GC. -------------------------------------------------------------------------- */ +#ifdef DEBUG void statDescribeGens(void) { @@ -626,7 +776,7 @@ statDescribeGens(void) bdescr *bd; step *step; - fprintf(stderr, " Gen Steps Max Mutable Mut-Once Step Blocks Live Large\n Blocks Closures Closures Objects\n"); + debugBelch(" Gen Steps Max Mutable Mut-Once Step Blocks Live Large\n Blocks Closures Closures Objects\n"); for (g = 0; g < RtsFlags.GcFlags.generations; g++) { for (m = generations[g].mut_list, mut = 0; m != END_MUT_LIST; @@ -635,7 +785,7 @@ statDescribeGens(void) for (m = generations[g].mut_once_list, mut_once = 0; m != END_MUT_LIST; m = m->mut_link) mut_once++; - fprintf(stderr, "%8d %8d %8d %9d %9d", g, generations[g].n_steps, + debugBelch("%8d %8d %8d %9d %9d", g, generations[g].n_steps, generations[g].max_blocks, mut, mut_once); for (s = 0; s < generations[g].n_steps; s++) { @@ -652,19 +802,57 @@ statDescribeGens(void) live += (bd->free - bd->start) * sizeof(W_); } if (s != 0) { - fprintf(stderr,"%46s",""); + debugBelch("%46s",""); } - fprintf(stderr,"%6d %8d %8d %8d\n", s, step->n_blocks, + debugBelch("%6d %8d %8d %8d\n", s, step->n_blocks, live, lge); } } - fprintf(stderr,"\n"); + debugBelch("\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_); } + +/* ----------------------------------------------------------------------------- + Dumping stuff in the stats file, or via the debug message interface + -------------------------------------------------------------------------- */ + +static void +statsPrintf( char *s, ... ) +{ + FILE *sf = RtsFlags.GcFlags.statsFile; + va_list ap; + + va_start(ap,s); + if (sf == NULL) { + vdebugBelch(s,ap); + } else { + vfprintf(sf, s, ap); + } + va_end(ap); +} + +static void +statsFlush( void ) +{ + FILE *sf = RtsFlags.GcFlags.statsFile; + if (sf != NULL) { + fflush(sf); + } +} + +static void +statsClose( void ) +{ + FILE *sf = RtsFlags.GcFlags.statsFile; + if (sf != NULL) { + fclose(sf); + } +}