Updating a thunk in raiseAsync might encounter an IND; cope

[ghc-hetmet.git] / rts / Stats.c

diff --git a/rts/Stats.c b/rts/Stats.c
index 1b0abaa..fcca405 100644 (file)
--- a/rts/Stats.c
+++ b/rts/Stats.c
@@ -66,6 +66,7 @@ static lnat ResidencySamples = 0; // for stats only
 static lnat GC_start_faults = 0, GC_end_faults = 0;
 
 static Ticks *GC_coll_times;
+static Ticks *GC_coll_etimes;
 
 static void statsFlush( void );
 static void statsClose( void );
@@ -138,8 +139,13 @@ initStats(void)
        (Ticks *)stgMallocBytes(
            sizeof(Ticks)*RtsFlags.GcFlags.generations,
            "initStats");
+    GC_coll_etimes = 
+       (Ticks *)stgMallocBytes(
+           sizeof(Ticks)*RtsFlags.GcFlags.generations,
+           "initStats");
     for (i = 0; i < RtsFlags.GcFlags.generations; i++) {
        GC_coll_times[i] = 0;
+       GC_coll_etimes[i] = 0;
     }
 }    
 
@@ -171,8 +177,6 @@ stat_endInit(void)
        InitElapsedTime = elapsed - ElapsedTimeStart;
     }
 #if USE_PAPI
-    papi_init_eventsets();
-
     /* We start counting events for the mutator
      * when garbage collection starts
      * we switch to the GC event set. */
@@ -316,6 +320,7 @@ stat_endGC (lnat alloc, lnat live, lnat copied, lnat gen)
        }
 
        GC_coll_times[gen] += gc_time;
+       GC_coll_etimes[gen] += gc_etime;
 
        GC_tot_copied += (ullong) copied;
        GC_tot_alloc  += (ullong) alloc;
@@ -349,7 +354,11 @@ stat_endGC (lnat alloc, lnat live, lnat copied, lnat gen)
 #if USE_PAPI
     if(papi_is_reporting) {
       /* Switch to counting mutator events */
-      papi_stop_gc_count();
+      if (gen == 0) {
+          papi_stop_gc0_count();
+      } else {
+          papi_stop_gc1_count();
+      }
       papi_start_mutator_count();
     }
 #endif
@@ -531,12 +540,13 @@ stat_exit(int alloc)
 
            /* Print garbage collections in each gen */
            for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
-               statsPrintf("%11d collections in generation %d (%6.2fs)\n", 
+               statsPrintf("%11d collections in generation %d, %6.2fs, %6.2fs elapsed\n", 
                        generations[g].collections, g, 
-                       TICK_TO_DBL(GC_coll_times[g]));
+                        TICK_TO_DBL(GC_coll_times[g]),
+                        TICK_TO_DBL(GC_coll_etimes[g]));
            }
 
-           statsPrintf("\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));
 
 #if defined(THREADED_RTS)
@@ -606,16 +616,7 @@ stat_exit(int alloc)
             */
 
 #if USE_PAPI
-           /* PAPI reporting, should put somewhere else?
-            * Note that the cycles are counted _after_ the initialization of the RTS -- AR */
-
-           statsPrintf("  -- CPU Mutator counters --\n");
-           papi_mut_cycles();
-           papi_report(MutatorCounters);
-
-           statsPrintf("\n  -- CPU GC counters --\n");
-           papi_gc_cycles();
-           papi_report(GCCounters);
+            papi_stats_report();
 #endif
        }
 
@@ -675,14 +676,10 @@ statDescribeGens(void)
       for (bd = step->large_objects, lge = 0; bd; bd = bd->link) {
        lge++;
       }
-      live = step->n_large_blocks * BLOCK_SIZE;
-      bd = step->blocks;
       // This live figure will be slightly less that the "live" figure
       // given by +RTS -Sstderr, because we take don't count the
       // slop at the end of each block.
-      for (; bd; bd = bd->link) {
-       live += (bd->free - bd->start) * sizeof(W_);
-      }
+      live += countOccupied(step->blocks) + countOccupied(step->large_objects);
       if (s != 0) {
        debugBelch("%36s","");
       }