X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfHeap.c;h=1125fd0fc66cf12d10516dc0d3e4f9bb40f2b2e8;hb=03dc2dd3dd814ad85cc4c45e9cafc7b73163c8be;hp=49b38137918c36242f2bb220cc7e469ac9a5d352;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index 49b3813..1125fd0 100644
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.53 2004/08/13 13:10:25 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2003
  *
@@ -47,7 +46,7 @@
  * When era reaches max_era, the profiling stops because a closure can
  * store only up to (max_era - 1) as its creation or last use time.
  * -------------------------------------------------------------------------- */
-nat era;
+unsigned int era;
 static nat max_era;
 
 /* -----------------------------------------------------------------------------
@@ -229,7 +228,7 @@ doingRetainerProfiling( void )
     return (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER
 	    || RtsFlags.ProfFlags.retainerSelector != NULL);
 }
-#endif // PROFILING
+#endif /* PROFILING */
 
 // Precesses a closure 'c' being destroyed whose size is 'size'.
 // Make sure that LDV_recordDead() is not invoked on 'inherently used' closures
@@ -332,7 +331,7 @@ nextEra( void )
 	era++;
 
 	if (era == max_era) {
-	    prog_belch("maximum number of censuses reached; use +RTS -i to reduce");
+	    errorBelch("maximum number of censuses reached; use +RTS -i to reduce");
 	    stg_exit(EXIT_FAILURE);
 	}
 	
@@ -342,7 +341,7 @@ nextEra( void )
 				       "nextEra");
 	}
     }
-#endif // PROFILING
+#endif /* PROFILING */
 
     initEra( &censuses[era] );
 }
@@ -368,7 +367,7 @@ void initProfiling2( void )
     
     /* open the log file */
     if ((hp_file = fopen(hp_filename, "w")) == NULL) {
-      fprintf(stderr, "Can't open profiling report file %s\n", 
+      debugBelch("Can't open profiling report file %s\n", 
 	      hp_filename);
       RtsFlags.ProfFlags.doHeapProfile = 0;
       return;
@@ -406,7 +405,7 @@ initHeapProfiling(void)
 
 #ifdef PROFILING
     if (doingLDVProfiling() && doingRetainerProfiling()) {
-	prog_belch("cannot mix -hb and -hr");
+	errorBelch("cannot mix -hb and -hr");
 	stg_exit(1);
     }
 #endif
@@ -561,13 +560,13 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
     }
     fprintf(fp, "%s", buf);
 }
-#endif // PROFILING
+#endif /* PROFILING */
 
 rtsBool
 strMatchesSelector( char* str, char* sel )
 {
    char* p;
-   // fprintf(stderr, "str_matches_selector %s %s\n", str, sel);
+   // debugBelch("str_matches_selector %s %s\n", str, sel);
    while (1) {
        // Compare str against wherever we've got to in sel.
        p = str;
@@ -696,8 +695,8 @@ aggregateCensusInfo( void )
 		// totals *must* be zero.
 		ASSERT(c->c.ldv.void_total == 0 && c->c.ldv.drag_total == 0);
 
-		// fprintCCS(stderr,c->identity);
-		// fprintf(stderr," census=%d void_total=%d drag_total=%d\n",
+		// debugCCS(c->identity);
+		// debugBelch(" census=%d void_total=%d drag_total=%d\n",
 		//         t, c->c.ldv.void_total, c->c.ldv.drag_total);
 	    } else {
 		d->c.ldv.void_total += c->c.ldv.void_total;
@@ -908,7 +907,6 @@ heapCensusChain( Census *census, bdescr *bd )
 	    case FOREIGN:
 	    case STABLE_NAME:
 	    case MUT_VAR:
-	    case MUT_CONS:
 		prim = rtsTrue;
 		size = sizeW_fromITBL(info);
 		break;