X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStats.c;h=6197b033f91ba20db6d3b05c143d8ebb934b70df;hb=e022e6a0e146a4c6a28f9906dc1f715b5682a591;hp=7c1dbaf946b199d98a5b3d4f01c2d75d24769c73;hpb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;p=ghc-hetmet.git diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c index 7c1dbaf..6197b03 100644 --- a/ghc/rts/Stats.c +++ b/ghc/rts/Stats.c @@ -19,6 +19,7 @@ #include "ParTicky.h" /* ToDo: move into Rts.h */ #include "Profiling.h" #include "Storage.h" +#include "Task.h" #ifdef HAVE_UNISTD_H #include @@ -76,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; @@ -118,10 +117,12 @@ 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, ... ); +static void statsPrintf( char *s, ... ) + GNUC3_ATTRIBUTE(format (printf, 1, 2)); + static void statsFlush( void ); static void statsClose( void ); @@ -140,7 +141,7 @@ static void statsClose( void ); #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; @@ -172,29 +173,29 @@ 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 @@ -208,10 +209,9 @@ getTimes(void) struct tms t; clock_t r = times(&t); - CurrentElapsedTime = r; - CurrentUserTime = t.tms_utime; + *elapsed = r; + *user = t.tms_utime; #endif - } #endif /* !win32 */ @@ -236,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 @@ -299,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; @@ -328,20 +331,21 @@ stat_startInit(void) 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; } } @@ -354,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 } @@ -377,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; } @@ -407,6 +415,8 @@ void stat_startGC(void) { nat bell = RtsFlags.GcFlags.ringBell; + TICK_TYPE user, elapsed; + if (bell) { if (bell > 1) { @@ -418,16 +428,16 @@ stat_startGC(void) } #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(); } @@ -441,12 +451,14 @@ stat_startGC(void) void stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen) { + 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; @@ -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 @@ -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) -{ - 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 () +stat_getTimes ( long *currentElapsedTime, + long *currentUserTime, + long *elapsedGCTime ) { - getTimes(); - return CurrentElapsedTime; + getTimes(currentUserTime, currentElapsedTime); + *elapsedGCTime = GCe_tot_time; } -#endif /* ----------------------------------------------------------------------------- Called at the end of execution @@ -620,6 +615,8 @@ long int stat_getElapsedTime () void stat_exit(int alloc) { + TICK_TYPE user, elapsed; + if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { char temp[BIG_STRING_LEN]; @@ -627,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; @@ -644,17 +636,24 @@ 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 + /* 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); @@ -687,17 +686,18 @@ stat_exit(int alloc) 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++) { - 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), - 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 @@ -744,7 +744,7 @@ stat_exit(int alloc) if (RtsFlags.GcFlags.giveStats == ONELINE_GC_STATS) { /* print the long long separately to avoid bugginess on mingwin (2001-07-02, mingw-0.5) */ - statsPrintf("<>\n", total_collections, ResidencySamples == 0 ? 0 : @@ -771,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; - debugBelch(" 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++; - debugBelch("%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];