*
* ---------------------------------------------------------------------------*/
+#include "PosixSource.h"
#include "Rts.h"
-#include "RtsFlags.h"
+
#include "RtsUtils.h"
-#include "MBlock.h"
-#include "Storage.h"
#include "Schedule.h"
#include "Stats.h"
-#include "ParTicky.h" /* ToDo: move into Rts.h */
#include "Profiling.h"
#include "GetTime.h"
-#include "GC.h"
+#include "sm/Storage.h"
+#include "sm/GC.h" // gc_alloc_block_sync, whitehole_spin
#if USE_PAPI
#include "Papi.h"
-------------------------------------------------------------------------- */
#ifdef DEBUG
-#define TICK_VAR(arity) \
- extern StgInt SLOW_CALLS_##arity; \
- extern StgInt RIGHT_ARITY_##arity; \
- extern StgInt TAGGED_PTR_##arity;
-
#define TICK_VAR_INI(arity) \
StgInt SLOW_CALLS_##arity = 1; \
StgInt RIGHT_ARITY_##arity = 1; \
StgInt TAGGED_PTR_##arity = 0;
-extern StgInt TOTAL_CALLS;
-
-TICK_VAR(1)
-TICK_VAR(2)
-
TICK_VAR_INI(1)
TICK_VAR_INI(2)
{
nat i;
Task *task;
+ statsPrintf(" MUT time (elapsed) GC time (elapsed)\n");
for (i = 0, task = all_tasks;
task != NULL;
i++, task = task->all_link) {
- statsPrintf(" Task %2d %-8s : MUT time: %6.2fs (%6.2fs elapsed)\n"
- " GC time: %6.2fs (%6.2fs elapsed)\n\n",
+ statsPrintf(" Task %2d %-8s : %6.2fs (%6.2fs) %6.2fs (%6.2fs)\n",
i,
- (task->tso == NULL) ? "(worker)" : "(bound)",
+ (task->worker) ? "(worker)" : "(bound)",
TICK_TO_DBL(task->mut_time),
TICK_TO_DBL(task->mut_etime),
TICK_TO_DBL(task->gc_time),
}
}
+ statsPrintf("\n");
+
{
nat i;
lnat sparks_created = 0;
#endif
#if defined(THREADED_RTS) && defined(PROF_SPIN)
{
- nat g, s;
+ nat g;
- statsPrintf("recordMutableGen_sync: %"FMT_Word64"\n", recordMutableGen_sync.spin);
statsPrintf("gc_alloc_block_sync: %"FMT_Word64"\n", gc_alloc_block_sync.spin);
statsPrintf("whitehole_spin: %"FMT_Word64"\n", whitehole_spin);
for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
- for (s = 0; s < generations[g].n_steps; s++) {
- statsPrintf("gen[%d].steps[%d].sync_todo: %"FMT_Word64"\n", g, s, generations[g].steps[s].sync_todo.spin);
- statsPrintf("gen[%d].steps[%d].sync_large_objects: %"FMT_Word64"\n", g, s, generations[g].steps[s].sync_large_objects.spin);
- }
+ statsPrintf("gen[%d].sync_large_objects: %"FMT_Word64"\n", g, generations[g].sync_large_objects.spin);
}
}
#endif
}
if (RtsFlags.GcFlags.giveStats == ONELINE_GC_STATS) {
+ char *fmt1, *fmt2;
+ if (RtsFlags.MiscFlags.machineReadable) {
+ fmt1 = " [(\"bytes allocated\", \"%llu\")\n";
+ fmt2 = " ,(\"num_GCs\", \"%d\")\n"
+ " ,(\"average_bytes_used\", \"%ld\")\n"
+ " ,(\"max_bytes_used\", \"%ld\")\n"
+ " ,(\"num_byte_usage_samples\", \"%ld\")\n"
+ " ,(\"peak_megabytes_allocated\", \"%lu\")\n"
+ " ,(\"init_cpu_seconds\", \"%.2f\")\n"
+ " ,(\"init_wall_seconds\", \"%.2f\")\n"
+ " ,(\"mutator_cpu_seconds\", \"%.2f\")\n"
+ " ,(\"mutator_wall_seconds\", \"%.2f\")\n"
+ " ,(\"GC_cpu_seconds\", \"%.2f\")\n"
+ " ,(\"GC_wall_seconds\", \"%.2f\")\n"
+ " ]\n";
+ }
+ else {
+ fmt1 = "<<ghc: %llu bytes, ";
+ fmt2 = "%d GCs, %ld/%ld avg/max bytes residency (%ld samples), %luM in use, %.2f INIT (%.2f elapsed), %.2f MUT (%.2f elapsed), %.2f GC (%.2f elapsed) :ghc>>\n";
+ }
/* print the long long separately to avoid bugginess on mingwin (2001-07-02, mingw-0.5) */
- statsPrintf("<<ghc: %llu bytes, ", GC_tot_alloc*(ullong)sizeof(W_));
- statsPrintf("%d GCs, %ld/%ld avg/max bytes residency (%ld samples), %luM in use, %.2f INIT (%.2f elapsed), %.2f MUT (%.2f elapsed), %.2f GC (%.2f elapsed) :ghc>>\n",
+ statsPrintf(fmt1, GC_tot_alloc*(ullong)sizeof(W_));
+ statsPrintf(fmt2,
total_collections,
ResidencySamples == 0 ? 0 :
AvgResidency*sizeof(W_)/ResidencySamples,
void
statDescribeGens(void)
{
- nat g, s, mut, lge;
+ nat g, mut, lge;
lnat live, slop;
lnat tot_live, tot_slop;
bdescr *bd;
- step *step;
-
+ generation *gen;
+
debugBelch(
-"-----------------------------------------------------------------\n"
-" Gen Max Mut-list Step Blocks Large Live Slop\n"
-" Blocks Bytes Objects \n"
-"-----------------------------------------------------------------\n");
+"----------------------------------------------------------\n"
+" Gen Max Mut-list Blocks Large Live Slop\n"
+" Blocks Bytes Objects \n"
+"----------------------------------------------------------\n");
tot_live = 0;
tot_slop = 0;
mut += (bd->free - bd->start) * sizeof(W_);
}
- debugBelch("%5d %7d %9d", g, generations[g].max_blocks, mut);
+ gen = &generations[g];
- for (s = 0; s < generations[g].n_steps; s++) {
- step = &generations[g].steps[s];
- for (bd = step->large_objects, lge = 0; bd; bd = bd->link) {
- lge++;
- }
- live = step->n_words + countOccupied(step->large_objects);
- if (s != 0) {
- debugBelch("%23s","");
+ debugBelch("%5d %7d %9d", g, gen->max_blocks, mut);
+
+ for (bd = gen->large_objects, lge = 0; bd; bd = bd->link) {
+ lge++;
}
- slop = (step->n_blocks + step->n_large_blocks) * BLOCK_SIZE_W - live;
- debugBelch("%6d %8d %8d %8ld %8ld\n", s, step->n_blocks, lge,
+ live = gen->n_words + countOccupied(gen->large_objects);
+ slop = (gen->n_blocks + gen->n_large_blocks) * BLOCK_SIZE_W - live;
+ debugBelch("%8d %8d %8ld %8ld\n", gen->n_blocks, lge,
live*sizeof(W_), slop*sizeof(W_));
tot_live += live;
tot_slop += slop;
- }
}
- debugBelch("-----------------------------------------------------------------\n");
- debugBelch("%48s%8ld %8ld\n","",tot_live*sizeof(W_),tot_slop*sizeof(W_));
- debugBelch("-----------------------------------------------------------------\n");
+ debugBelch("----------------------------------------------------------\n");
+ debugBelch("%41s%8ld %8ld\n","",tot_live*sizeof(W_),tot_slop*sizeof(W_));
+ debugBelch("----------------------------------------------------------\n");
debugBelch("\n");
}
-------------------------------------------------------------------------- */
extern HsInt64 getAllocations( void )
-{ return (HsInt64)total_allocated * sizeof(W_); }
+{ return (HsInt64)GC_tot_alloc * sizeof(W_); }
/* -----------------------------------------------------------------------------
Dumping stuff in the stats file, or via the debug message interface
projects / ghc-hetmet.git / blobdiff