[project @ 2002-12-05 23:49:43 by mthomas]

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

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index 38a9aaa..7df27e1 100644 (file)
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.34 2001/12/12 15:01:25 simonmar Exp $
+ * $Id: ProfHeap.c,v 1.39 2002/11/01 11:05:46 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -30,6 +30,8 @@
 #include "Arena.h"
 #include "Printer.h"
 
+#include <string.h>
+
 /* -----------------------------------------------------------------------------
  * era stores the current time period.  It is the same as the
  * number of censuses that have been performed.
@@ -93,8 +95,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 );
@@ -489,6 +491,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 +500,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) {
@@ -748,7 +762,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:
@@ -971,8 +985,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 {