[project @ 1999-05-20 10:23:42 by simonmar]

+RTS -s<file> now gives "summary" statistics only (i.e. without the per-gc
stat lines).

diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c
index 52112bc..3c2af6c 100644 (file)
--- a/ghc/rts/RtsFlags.c
+++ b/ghc/rts/RtsFlags.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.c,v 1.13 1999/05/11 16:47:55 keithw Exp $
+ * $Id: RtsFlags.c,v 1.14 1999/05/20 10:23:42 simonmar Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1994-1997
  * (c) The GHC Team, 1998-1999
@@ -525,9 +525,11 @@ error = rtsTrue;
                }
                break;
 
-             case 'S': /* NB: no difference at present ! */
+             case 'S':
+               RtsFlags.GcFlags.giveStats ++;
+
              case 's':
-               RtsFlags.GcFlags.giveStats ++; /* will be VERBOSE_GC_STATS */
+               RtsFlags.GcFlags.giveStats ++;
 #ifdef PAR
                /* Opening all those files would almost certainly fail... */
                RtsFlags.ParFlags.parallelStats = rtsTrue;

diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c
index fa0fe8f..7a00d24 100644 (file)
--- a/ghc/rts/Stats.c
+++ b/ghc/rts/Stats.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stats.c,v 1.12 1999/03/04 13:07:48 sof Exp $
+ * $Id: Stats.c,v 1.13 1999/05/20 10:23:43 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -354,7 +354,7 @@ stat_endGC(lnat alloc, lnat collect, lnat live, lnat copied, lnat gen)
        double time = usertime();
        double etime = elapsedtime();
 
-       if (RtsFlags.GcFlags.giveStats) {
+       if (RtsFlags.GcFlags.giveStats >= VERBOSE_GC_STATS) {
            nat faults = pagefaults();
 
            fprintf(sf, "%9ld %9ld %9ld",