[project @ 2001-11-02 11:15:00 by simonmar]

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

diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c
index 5e69da3..47b050d 100644 (file)
--- a/ghc/rts/Stats.c
+++ b/ghc/rts/Stats.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stats.c,v 1.29 2001/07/03 16:26:03 rrt Exp $
+ * $Id: Stats.c,v 1.33 2001/11/02 11:15:00 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,7 +7,9 @@
  *
  * ---------------------------------------------------------------------------*/
 
-#define NON_POSIX_SOURCE
+/* Alas, no.  This source is non-posix.
+   #include "PosixSource.h" 
+*/
 
 #include "Rts.h"
 #include "RtsFlags.h"
@@ -131,6 +133,8 @@ getTimes(void)
     if (!GetProcessTimes (GetCurrentProcess(), &creationTime,
                          &exitTime, &kernelTime, &userTime)) {
        /* Probably on a Win95 box..*/
+       CurrentElapsedTime = 0;
+       CurrentUserTime = 0;
        return;
     }
 
@@ -570,8 +574,8 @@ stat_exit(int alloc)
            fprintf(sf, "  Total time  %6.2fs  (%6.2fs elapsed)\n\n",
                    TICK_TO_DBL(time), TICK_TO_DBL(etime));
            fprintf(sf, "  %%GC time     %5.1f%%  (%.1f%% elapsed)\n\n",
-                   TICK_TO_DBL(GC_tot_time)*100/time, 
-                   TICK_TO_DBL(GCe_tot_time)*100/etime);
+                   TICK_TO_DBL(GC_tot_time)*100/TICK_TO_DBL(time),
+                   TICK_TO_DBL(GCe_tot_time)*100/TIC_TO_DBL(etime));
 
            if (time - GC_tot_time == 0)
                ullong_format_string(0, temp, rtsTrue/*commas*/);
@@ -615,14 +619,14 @@ stat_exit(int alloc)
    Produce some detailed info on the state of the generational GC.
    -------------------------------------------------------------------------- */
 void
-stat_describe_gens(void)
+statDescribeGens(void)
 {
   nat g, s, mut, mut_once, lge, live;
   StgMutClosure *m;
   bdescr *bd;
   step *step;
 
-  fprintf(stderr, "     Gen    Steps      Max   Mutable  Mut-Once  Step   Blocks     Live    Large\n                    Blocks  Closures  Closures                         Objects\n");
+  fprintf(stderr, "     Gen    Steps      Max   Mutable  Mut-Once  Step   Blocks     Live    Large\n                    Blocks  Closures  Closures                          Objects\n");
 
   for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
     for (m = generations[g].mut_list, mut = 0; m != END_MUT_LIST; 
@@ -640,7 +644,7 @@ stat_describe_gens(void)
        lge++;
       live = 0;
       if (RtsFlags.GcFlags.generations == 1) {
-       bd = step->to_space;
+       bd = step->to_blocks;
       } else {
        bd = step->blocks;
       }