[project @ 2003-01-23 12:13:10 by simonmar]

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

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index 73ca19d..675acd6 100644 (file)
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.33 2001/12/12 14:31:42 simonmar Exp $
+ * $Id: ProfHeap.c,v 1.41 2003/01/23 12:13:12 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -30,6 +30,9 @@
 #include "Arena.h"
 #include "Printer.h"
 
+#include <string.h>
+#include <stdlib.h>
+
 /* -----------------------------------------------------------------------------
  * era stores the current time period.  It is the same as the
  * number of censuses that have been performed.
@@ -93,8 +96,8 @@ typedef struct {
     int       drag_total;
 } Census;
 
-Census *censuses = NULL;
-nat n_censuses = 0;
+static Census *censuses = NULL;
+static nat n_censuses = 0;
 
 #ifdef PROFILING
 static void aggregateCensusInfo( void );
@@ -125,7 +128,8 @@ static char *type_names[] = {
     , "THUNK_SELECTOR"
 
     , "BCO"
-    , "AP_UPD"
+    , "AP_STACK"
+    , "AP"
 
     , "PAP"
 
@@ -144,7 +148,6 @@ static char *type_names[] = {
     , "UPDATE_FRAME"
     , "CATCH_FRAME"
     , "STOP_FRAME"
-    , "SEQ_FRAME"
 
     , "BLACKHOLE"
     , "BLACKHOLE_BQ"
@@ -327,7 +330,8 @@ nextEra( void )
        era++;
 
        if (era == max_era) {
-           barf("maximum number of censuses reached; use +RTS -i to reduce");
+           prog_belch("maximum number of censuses reached; use +RTS -i to reduce");
+           stg_exit(EXIT_FAILURE);
        }
        
        if (era == n_censuses) {
@@ -337,7 +341,7 @@ nextEra( void )
        }
     }
 #endif // PROFILING
-       
+
     initEra( &censuses[era] );
 }
 
@@ -489,6 +493,8 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
        return;
     }
 
+    fprintf(fp, "(%d)", ccs->ccsID);
+
     // keep printing components of the stack until we run out of space
     // in the buffer.  If we run out of space, end with "...".
     for (; ccs != NULL && ccs != CCS_MAIN; ccs = ccs->prevStack) {
@@ -496,18 +502,28 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
        // CAF cost centres print as M.CAF, but we leave the module
        // name out of all the others to save space.
        if (!strcmp(ccs->cc->label,"CAF")) {
+#ifdef HAVE_SNPRINTF
            written = snprintf(buf+next_offset, 
                               (int)max_length-3-(int)next_offset,
                               "%s.CAF", ccs->cc->module);
+#else
+           written = sprintf(buf+next_offset, 
+                              "%s.CAF", ccs->cc->module);
+#endif
        } else {
            if (ccs->prevStack != NULL && ccs->prevStack != CCS_MAIN) {
                template = "%s/";
            } else {
                template = "%s";
            }
+#ifdef HAVE_SNPRINTF
            written = snprintf(buf+next_offset, 
                               (int)max_length-3-(int)next_offset,
                               template, ccs->cc->label);
+#else
+           written = sprintf(buf+next_offset, 
+                              template, ccs->cc->label);
+#endif
        }
 
        if (next_offset+written >= max_length-4) {
@@ -617,8 +633,8 @@ aggregateCensusInfo( void )
            drag_total += censuses[t].drag_total;
            censuses[t].void_total = void_total;
            censuses[t].drag_total = drag_total;
-           ASSERT( censuses[t].void_total < censuses[t].not_used );
-           ASSERT( censuses[t].drag_total < censuses[t].used );
+           ASSERT( censuses[t].void_total <= censuses[t].not_used );
+           ASSERT( censuses[t].drag_total <= censuses[t].used );
        }
        
        return;
@@ -748,7 +764,7 @@ dumpCensus( Census *census )
 #ifdef PROFILING
        switch (RtsFlags.ProfFlags.doHeapProfile) {
        case HEAP_BY_CCS:
-           fprint_ccs(hp_file, (CostCentreStack *)ctr->identity, 30);
+           fprint_ccs(hp_file, (CostCentreStack *)ctr->identity, 25);
            break;
        case HEAP_BY_MOD:
        case HEAP_BY_DESCR:
@@ -856,10 +872,14 @@ heapCensusChain( Census *census, bdescr *bd )
                size = sizeofW(StgHeader) + MIN_UPD_SIZE;
                break;
 
+           case AP:
            case PAP:
-           case AP_UPD:
                size = pap_sizeW((StgPAP *)p);
                break;
+
+           case AP_STACK:
+               size = ap_stack_sizeW((StgAP_STACK *)p);
+               break;
                
            case ARR_WORDS:
                prim = rtsTrue;
@@ -874,8 +894,14 @@ heapCensusChain( Census *census, bdescr *bd )
                
            case TSO:
                prim = rtsTrue;
-               size = tso_sizeW((StgTSO *)p);
-               break;
+               if (RtsFlags.ProfFlags.includeTSOs) {
+                   size = tso_sizeW((StgTSO *)p);
+                   break;
+               } else {
+                   // Skip this TSO and move on to the next object
+                   p += tso_sizeW((StgTSO *)p);
+                   continue;
+               }
                
            default:
                barf("heapCensus");
@@ -971,8 +997,14 @@ heapCensus( void )
   stat_startHeapCensus();
 #endif
 
-  // traverse the heap, collecting the census info
+  // Traverse the heap, collecting the census info
+
+  // First the small_alloc_list: we have to fix the free pointer at
+  // the end by calling tidyAllocatedLists() first.
+  tidyAllocateLists();
   heapCensusChain( census, small_alloc_list );
+
+  // Now traverse the heap in each generation/step.
   if (RtsFlags.GcFlags.generations == 1) {
       heapCensusChain( census, g0s0->to_blocks );
   } else {
@@ -981,7 +1013,7 @@ heapCensus( void )
              heapCensusChain( census, generations[g].steps[s].blocks );
              // Are we interested in large objects?  might be
              // confusing to include the stack in a heap profile.
-             // heapCensusChain( census, generations[g].steps[s].large_objects );
+             heapCensusChain( census, generations[g].steps[s].large_objects );
          }
       }
   }