[project @ 2000-08-15 14:18:43 by simonmar]

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

diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c
index 4739c78..d621192 100644 (file)
--- a/ghc/rts/Stats.c
+++ b/ghc/rts/Stats.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stats.c,v 1.19 1999/12/03 15:55:29 chak Exp $
+ * $Id: Stats.c,v 1.21 2000/07/17 15:15:40 rrt Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif
 
-#ifndef __MINGW32__
+#ifndef mingw32_TARGET_OS
 # ifdef HAVE_SYS_TIMES_H
 #  include <sys/times.h>
 # endif
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#if ! irix_TARGET_OS && ! defined(__MINGW32__)
+#if ! irix_TARGET_OS && ! defined(mingw32_TARGET_OS)
 # if defined(HAVE_SYS_RESOURCE_H)
 #  include <sys/resource.h>
 # endif
@@ -420,7 +420,7 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen)
                    gc_time, 
                    gc_etime,
                    time,
-                   etime,
+                   etime - ElapsedTimeStart,
                    faults - GC_start_faults,
                    GC_start_faults - GC_end_faults,
                    gen);
@@ -441,7 +441,7 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen)
          nat i;
          pthread_t me = pthread_self();
 
-         for (i = 0; i < RtsFlags.ConcFlags.nNodes; i++) {
+         for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) {
            if (me == task_ids[i].id) {
              task_ids[i].gc_time += gc_time;
              task_ids[i].gc_etime += gc_etime;
@@ -479,7 +479,7 @@ stat_workerStop(void)
   nat i;
   pthread_t me = pthread_self();
 
-  for (i = 0; i < RtsFlags.ConcFlags.nNodes; i++) {
+  for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) {
     if (task_ids[i].id == me) {
       task_ids[i].mut_time = usertime() - task_ids[i].gc_time;
       task_ids[i].mut_etime = elapsedtime()
@@ -552,7 +552,7 @@ stat_exit(int alloc)
        {
          nat i;
          MutUserTime = 0.0;
-         for (i = 0; i < RtsFlags.ConcFlags.nNodes; i++) {
+         for (i = 0; i < RtsFlags.ParFlags.nNodes; i++) {
            MutUserTime += task_ids[i].mut_time;
            fprintf(sf, "  Task %2d:  MUT time: %6.2fs  (%6.2fs elapsed)\n"
                        "            GC  time: %6.2fs  (%6.2fs elapsed)\n\n",