X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FProfiling.c;h=6d23bc2fe260c84d8e8a367984c7a82e26c8e3e7;hb=8625c675de45bdb8bcfa795572ce7c47687c147c;hp=d729c8a09e5fff16d291a8f220cf34a796df005b;hpb=f0a352756958c7c841da25143f7fdea610ab9a21;p=ghc-hetmet.git

diff --git a/rts/Profiling.c b/rts/Profiling.c
index d729c8a..6d23bc2 100644
--- a/rts/Profiling.c
+++ b/rts/Profiling.c
@@ -10,15 +10,13 @@
 
 #include "PosixSource.h"
 #include "Rts.h"
+
 #include "RtsUtils.h"
-#include "RtsFlags.h"
 #include "Profiling.h"
 #include "Proftimer.h"
-#include "Timer.h"
 #include "ProfHeap.h"
 #include "Arena.h"
 #include "RetainerProfile.h"
-#include "LdvProfile.h"
 
 #include <string.h>
 
@@ -42,7 +40,7 @@ unsigned int HP_ID;
 
 /* figures for the profiling report.
  */
-static ullong total_alloc;
+static StgWord64 total_alloc;
 static lnat   total_prof_ticks;
 
 /* Globals for opening the profiling log file(s)
@@ -699,7 +697,7 @@ report_per_cc_costs( void )
       
       if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) {
 	fprintf(prof_file, "  %5" FMT_Word64 " %9" FMT_Word64,
-		(StgWord64)(cc->time_ticks), cc->mem_alloc);
+		(StgWord64)(cc->time_ticks), cc->mem_alloc*sizeof(W_));
       }
       fprintf(prof_file, "\n");
   }
@@ -772,7 +770,7 @@ reportCCSProfiling( void )
         (int) RtsFlags.MiscFlags.tickInterval);
 
     fprintf(prof_file, "\ttotal alloc = %11s bytes",
-	    ullong_format_string(total_alloc * sizeof(W_),
+	    showStgWord64(total_alloc * sizeof(W_),
 				 temp, rtsTrue/*commas*/));
 
 #if defined(PROFILING_DETAIL_COUNTS)