[project @ 2003-06-27 18:28:31 by sof]

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

diff --git a/ghc/rts/Profiling.c b/ghc/rts/Profiling.c
index 902c391..c5baff0 100644 (file)
--- a/ghc/rts/Profiling.c
+++ b/ghc/rts/Profiling.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Profiling.c,v 1.32 2002/07/05 01:23:45 mthomas Exp $
+ * $Id: Profiling.c,v 1.36 2003/02/22 04:51:52 sof Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -16,12 +16,14 @@
 #include "Profiling.h"
 #include "Storage.h"
 #include "Proftimer.h"
-#include "Itimer.h"
+#include "Timer.h"
 #include "ProfHeap.h"
 #include "Arena.h"
 #include "RetainerProfile.h"
 #include "LdvProfile.h"
 
+#include <string.h>
+
 /*
  * Profiling allocation arena.
  */
@@ -38,7 +40,8 @@ unsigned int HP_ID;
 
 /* figures for the profiling report.
  */
-static lnat total_alloc, total_prof_ticks;
+static ullong total_alloc;
+static lnat   total_prof_ticks;
 
 /* Globals for opening the profiling log file(s)
  */
@@ -712,6 +715,7 @@ reportCCSProfiling( void )
       gen_XML_logfile();
       return;
     default:
+      break;
     }
 
     fprintf(prof_file, "\t%s Time and Allocation Profiling Report  (%s)\n", 
@@ -732,9 +736,8 @@ reportCCSProfiling( void )
            total_prof_ticks, TICK_MILLISECS);
 
     fprintf(prof_file, "\ttotal alloc = %11s bytes",
-           ullong_format_string((ullong) total_alloc * sizeof(W_),
+           ullong_format_string(total_alloc * sizeof(W_),
                                 temp, rtsTrue/*commas*/));
-    /* ToDo: 64-bit error! */
 
 #if defined(PROFILING_DETAIL_COUNTS)
     fprintf(prof_file, "  (%lu closures)", total_allocs);