X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStats.c;h=6197b033f91ba20db6d3b05c143d8ebb934b70df;hb=daa4d18454157f664a0ff333bb592bb0bd6b4edc;hp=8e79801d25fca4028ac61f4151d8099d3ae69d79;hpb=d2a0936520673ad341b1b4756c37ee429fc111ca;p=ghc-hetmet.git diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c index 8e79801..6197b03 100644 --- a/ghc/rts/Stats.c +++ b/ghc/rts/Stats.c @@ -1,7 +1,6 @@ /* ----------------------------------------------------------------------------- - * $Id: Stats.c,v 1.47 2004/05/27 09:29:28 simonmar Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2004 * * Statistics and timing-related functions. * @@ -14,18 +13,19 @@ #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 "Profiling.h" +#include "Storage.h" +#include "Task.h" #ifdef HAVE_UNISTD_H #include #endif -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS # ifdef HAVE_SYS_TIMES_H # include # endif @@ -41,7 +41,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 @@ -59,7 +59,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 @@ -77,8 +77,6 @@ static int TicksPerSecond = 0; static TICK_TYPE ElapsedTimeStart = 0; -static TICK_TYPE CurrentElapsedTime = 0; -static TICK_TYPE CurrentUserTime = 0; static TICK_TYPE InitUserTime = 0; static TICK_TYPE InitElapsedTime = 0; @@ -119,12 +117,18 @@ static lnat GC_start_faults = 0, GC_end_faults = 0; static TICK_TYPE *GC_coll_times; -static void getTimes(void); +static void getTimes( long *elapsed, long *user ); static nat pageFaults(void); +static void statsPrintf( char *s, ... ) + GNUC3_ATTRIBUTE(format (printf, 1, 2)); + +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) \ @@ -134,10 +138,10 @@ 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) +getTimes( TICK_TYPE *elapsed, TICK_TYPE *user ) { static int is_win9x = -1; @@ -169,46 +173,45 @@ getTimes(void) if (!GetProcessTimes (GetCurrentProcess(), &creationTime, &exitTime, &kernelTime, &userTime)) { /* Probably on a Win95 box..*/ - CurrentElapsedTime = 0; - CurrentUserTime = 0; + *elapsed = 0; + *user = 0; return; } } FT2longlong(kT,kernelTime); FT2longlong(uT,userTime); - CurrentElapsedTime = uT + kT; - CurrentUserTime = uT; + *elapsed = uT + kT; + *user = uT; if (is_win9x) { /* Adjust for the fact that we're using system time & not process time on Win9x. */ - CurrentUserTime -= ElapsedTimeStart; - CurrentElapsedTime -= ElapsedTimeStart; + *user -= ElapsedTimeStart; + *elapsed -= ElapsedTimeStart; } } #else /* !win32 */ static void -getTimes(void) +getTimes( TICK_TYPE *user, TICK_TYPE *elapsed ) { #ifndef HAVE_TIMES /* 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 */ struct tms t; clock_t r = times(&t); - CurrentElapsedTime = r; - CurrentUserTime = t.tms_utime; + *elapsed = r; + *user = t.tms_utime; #endif - } #endif /* !win32 */ @@ -233,8 +236,9 @@ mut_user_time_during_GC( void ) double mut_user_time( void ) { - getTimes(); - return TICK_TO_DBL(CurrentUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time)); + TICK_TYPE user, elapsed; + getTimes(&user, &elapsed); + return TICK_TO_DBL(user - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time)); } #ifdef PROFILING @@ -261,7 +265,7 @@ 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; @@ -275,11 +279,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( @@ -297,6 +300,8 @@ initStats(void) void stat_startInit(void) { + TICK_TYPE user, elapsed; + /* Determine TicksPerSecond ... */ #if defined(CLK_TCK) /* defined by POSIX */ TicksPerSecond = CLK_TCK; @@ -306,7 +311,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; @@ -322,24 +327,25 @@ 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 - getTimes(); - ElapsedTimeStart = CurrentElapsedTime; + getTimes( &user, &elapsed ); + ElapsedTimeStart = elapsed; } void stat_endInit(void) { - getTimes(); - InitUserTime = CurrentUserTime; - InitElapsedStamp = CurrentElapsedTime; - if (ElapsedTimeStart > CurrentElapsedTime) { + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + InitUserTime = user; + InitElapsedStamp = elapsed; + if (ElapsedTimeStart > elapsed) { InitElapsedTime = 0; } else { - InitElapsedTime = CurrentElapsedTime - ElapsedTimeStart; + InitElapsedTime = elapsed - ElapsedTimeStart; } } @@ -352,22 +358,24 @@ stat_endInit(void) void stat_startExit(void) { - getTimes(); - MutElapsedStamp = CurrentElapsedTime; - MutElapsedTime = CurrentElapsedTime - GCe_tot_time - + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + + MutElapsedStamp = elapsed; + MutElapsedTime = elapsed - 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 + /* for threads, 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 * calculate the EXIT time. The real MutUserTime is calculated * in stat_exit below. */ -#ifdef SMP - MutUserTime = CurrentUserTime; +#if defined(RTS_SUPPORTS_THREADS) + MutUserTime = user; #else - MutUserTime = CurrentUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; + MutUserTime = user - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; if (MutUserTime < 0) { MutUserTime = 0; } #endif } @@ -375,13 +383,15 @@ stat_startExit(void) void stat_endExit(void) { - getTimes(); -#ifdef SMP - ExitUserTime = CurrentUserTime - MutUserTime; + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + +#if defined(RTS_SUPPORTS_THREADS) + ExitUserTime = user - MutUserTime; #else - ExitUserTime = CurrentUserTime - MutUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; + ExitUserTime = user - MutUserTime - GC_tot_time - PROF_VAL(RP_tot_time + HC_tot_time) - InitUserTime; #endif - ExitElapsedTime = CurrentElapsedTime - MutElapsedStamp; + ExitElapsedTime = elapsed - MutElapsedStamp; if (ExitUserTime < 0) { ExitUserTime = 0; } @@ -405,27 +415,29 @@ void stat_startGC(void) { nat bell = RtsFlags.GcFlags.ringBell; + TICK_TYPE user, elapsed; + if (bell) { if (bell > 1) { - fprintf(stderr, " GC "); + debugBelch(" GC "); rub_bell = 1; } else { - fprintf(stderr, "\007"); + debugBelch("\007"); } } #if defined(PROFILING) || defined(DEBUG) - getTimes(); - GC_start_time = CurrentUserTime; /* needed in mut_user_time_during_GC() */ + getTimes( &user, &elapsed ); + GC_start_time = user; /* needed in mut_user_time_during_GC() */ #endif if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { #if !defined(PROFILING) && !defined(DEBUG) - getTimes(); - GC_start_time = CurrentUserTime; + getTimes( &user, &elapsed ); + GC_start_time = user; #endif - GCe_start_time = CurrentElapsedTime; + GCe_start_time = elapsed; if (RtsFlags.GcFlags.giveStats) { GC_start_faults = pageFaults(); } @@ -439,23 +451,23 @@ stat_startGC(void) void stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) { - FILE *sf = RtsFlags.GcFlags.statsFile; + TICK_TYPE user, elapsed; if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { TICK_TYPE time, etime, gc_time, gc_etime; - getTimes(); - time = CurrentUserTime; - etime = CurrentElapsedTime; + getTimes( &user, &elapsed ); + time = user; + etime = elapsed; 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), @@ -465,7 +477,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; @@ -475,17 +487,13 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) GC_tot_time += gc_time; GCe_tot_time += gc_etime; -#ifdef SMP +#if defined(RTS_SUPPORTS_THREADS) { - nat i; - pthread_t me = pthread_self(); - - for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) { - if (me == task_ids[i].id) { - task_ids[i].gc_time += gc_time; - task_ids[i].gc_etime += gc_etime; - break; - } + TaskInfo *task_info = taskOfId(osThreadId()); + + if (task_info != NULL) { + task_info->gc_time += gc_time; + task_info->gc_etime += gc_etime; } } #endif @@ -500,7 +508,7 @@ 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; } } @@ -512,9 +520,11 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) void stat_startRP(void) { - getTimes(); - RP_start_time = CurrentUserTime; - RPe_start_time = CurrentElapsedTime; + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + + RP_start_time = user; + RPe_start_time = elapsed; } #endif /* PROFILING */ @@ -532,9 +542,11 @@ stat_endRP( #endif double averageNumVisit) { - getTimes(); - RP_tot_time += CurrentUserTime - RP_start_time; - RPe_tot_time += CurrentElapsedTime - RPe_start_time; + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + + RP_tot_time += user - RP_start_time; + RPe_tot_time += elapsed - RPe_start_time; fprintf(prof_file, "Retainer Profiling: %d, at %f seconds\n", retainerGeneration, mut_user_time_during_RP()); @@ -553,9 +565,11 @@ stat_endRP( void stat_startHeapCensus(void) { - getTimes(); - HC_start_time = CurrentUserTime; - HCe_start_time = CurrentElapsedTime; + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + + HC_start_time = user; + HCe_start_time = elapsed; } #endif /* PROFILING */ @@ -566,9 +580,11 @@ stat_startHeapCensus(void) void stat_endHeapCensus(void) { - getTimes(); - HC_tot_time += CurrentUserTime - HC_start_time; - HCe_tot_time += CurrentElapsedTime - HCe_start_time; + TICK_TYPE user, elapsed; + getTimes( &user, &elapsed ); + + HC_tot_time += user - HC_start_time; + HCe_tot_time += elapsed - HCe_start_time; } #endif /* PROFILING */ @@ -576,38 +592,17 @@ stat_endHeapCensus(void) 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. + stats for this thread into the taskTable struct for that thread. -------------------------------------------------------------------------- */ -#if defined(SMP) void -stat_workerStop(void) +stat_getTimes ( long *currentElapsedTime, + long *currentUserTime, + long *elapsedGCTime ) { - 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 = 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; } - if (task_ids[i].mut_etime < 0.0) { task_ids[i].mut_etime = 0.0; } - } - } -} -#endif - -#if defined(SMP) -long int stat_getElapsedTime () -{ - getTimes(); - return CurrentElapsedTime; + getTimes(currentUserTime, currentElapsedTime); + *elapsedGCTime = GCe_tot_time; } -#endif /* ----------------------------------------------------------------------------- Called at the end of execution @@ -620,8 +615,8 @@ long int stat_getElapsedTime () void stat_exit(int alloc) { - FILE *sf = RtsFlags.GcFlags.statsFile; - + TICK_TYPE user, elapsed; + if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { char temp[BIG_STRING_LEN]; @@ -629,16 +624,11 @@ stat_exit(int alloc) TICK_TYPE etime; nat g, total_collections = 0; - getTimes(); - time = CurrentUserTime; - etime = CurrentElapsedTime - ElapsedTimeStart; + getTimes( &user, &elapsed ); + etime = elapsed - ElapsedTimeStart; GC_tot_alloc += alloc; - /* avoid divide by zero if time is measured as 0.00 seconds -- SDM */ - if (time == 0.0) time = 1; - if (etime == 0.0) etime = 1; - /* Count total garbage collections */ for (g = 0; g < RtsFlags.GcFlags.generations; g++) total_collections += generations[g].collections; @@ -646,81 +636,89 @@ stat_exit(int alloc) /* For SMP, we have to get the user time from each thread * and try to work out the total time. */ -#ifdef SMP - { nat i; +#if defined(RTS_SUPPORTS_THREADS) + { + nat i; MutUserTime = 0.0; - for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) { - MutUserTime += task_ids[i].mut_time; + for (i = 0; i < taskCount; i++) { + MutUserTime += taskTable[i].mut_time; } } time = MutUserTime + GC_tot_time + InitUserTime + ExitUserTime; if (MutUserTime < 0) { MutUserTime = 0; } +#else + time = user; #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); + /* avoid divide by zero if time is measured as 0.00 seconds -- SDM */ + if (time == 0.0) time = 1; + if (etime == 0.0) etime = 1; + + 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 +#if defined(RTS_SUPPORTS_THREADS) { nat i; - for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) { - fprintf(sf, " 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), - TICK_TO_DBL(task_ids[i].mut_etime), - TICK_TO_DBL(task_ids[i].gc_time), - TICK_TO_DBL(task_ids[i].gc_etime)); + for (i = 0; i < taskCount; i++) { + statsPrintf(" Task %2d %-8s : MUT time: %6.2fs (%6.2fs elapsed)\n" + " GC time: %6.2fs (%6.2fs elapsed)\n\n", + i, + taskTable[i].is_worker ? "(worker)" : "(bound)", + TICK_TO_DBL(taskTable[i].mut_time), + TICK_TO_DBL(taskTable[i].mut_etime), + TICK_TO_DBL(taskTable[i].gc_time), + TICK_TO_DBL(taskTable[i].gc_etime)); } } #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)); #ifdef PROFILING - fprintf(sf, " RP time %6.2fs (%6.2fs elapsed)\n", + statsPrintf(" 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", + statsPrintf(" 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", + 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)); @@ -733,9 +731,9 @@ stat_exit(int alloc) 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", + 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), @@ -744,10 +742,10 @@ stat_exit(int alloc) / 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, ResidencySamples == 0 ? 0 : AvgResidency*sizeof(W_)/ResidencySamples, @@ -759,10 +757,8 @@ stat_exit(int alloc) TICK_TO_DBL(GC_tot_time), TICK_TO_DBL(GCe_tot_time)); } - fflush(sf); - if (sf != stderr) { - fclose(sf); - } + statsFlush(); + statsClose(); } } @@ -775,22 +771,20 @@ stat_exit(int alloc) void statDescribeGens(void) { - nat g, s, mut, mut_once, lge, live; - StgMutClosure *m; + nat g, s, mut, lge, live; 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 Step Blocks Live Large\n Blocks Closures Closures Objects\n"); + mut = 0; for (g = 0; g < RtsFlags.GcFlags.generations; g++) { - for (m = generations[g].mut_list, mut = 0; m != END_MUT_LIST; - m = m->mut_link) - mut++; - 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, - generations[g].max_blocks, mut, mut_once); + for (bd = generations[g].mut_list; bd != NULL; bd = bd->link) { + mut += bd->free - bd->start; + } + + debugBelch("%8d %8d %8d %9d", g, generations[g].n_steps, + generations[g].max_blocks, mut); for (s = 0; s < generations[g].n_steps; s++) { step = &generations[g].steps[s]; @@ -806,13 +800,13 @@ 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 @@ -823,3 +817,40 @@ statDescribeGens(void) 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); + } +}