[project @ 2001-09-07 16:08:31 by sewardj]

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

diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c
index 5f6244e..a95d443 100644 (file)
--- a/ghc/rts/RtsFlags.c
+++ b/ghc/rts/RtsFlags.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.c,v 1.45 2001/08/07 10:37:04 simonmar Exp $
+ * $Id: RtsFlags.c,v 1.50 2001/08/31 11:42:44 sewardj Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1994-1997
  * (c) The GHC Team, 1998-1999
@@ -21,6 +21,7 @@
 //@node Includes, Constants
 //@subsection Includes
 
+#include "PosixSource.h"
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
@@ -237,7 +238,7 @@ void initRtsFlagsDefaults(void)
     RtsFlags.GcFlags.steps              = 2;
     RtsFlags.GcFlags.squeezeUpdFrames  = rtsTrue;
 #endif
-    RtsFlags.GcFlags.compact            = rtsTrue;
+    RtsFlags.GcFlags.compact            = rtsFalse;
     RtsFlags.GcFlags.compactThreshold   = 30.0;
 #ifdef RTS_GTK_FRONTPANEL
     RtsFlags.GcFlags.frontpanel         = rtsFalse;
@@ -384,14 +385,14 @@ usage_text[] = {
 "  -k<size> Sets the initial thread stack size (default 1k)  Egs: -K4k   -K2m",
 "",
 "  -A<size> Sets the minimum allocation area size (default 256k) Egs: -A1m -A10k",
-"  -M<size> Sets the maximum heap size (default 64M)  Egs: -M256k -M1G",
+"  -M<size> Sets the maximum heap size (default unlimited)  Egs: -M256k -M1G",
 "  -H<size> Sets the minimum heap size (default 0M)   Egs: -H24m  -H1G",
 "  -m<n>    Minimum % of heap which must be available (default 3%)",
 "  -G<n>    Number of generations (default: 2)",
 "  -T<n>    Number of steps in younger generations (default: 2)",
 "  -c<n>    Auto-enable compaction of the oldest generation when live data is",
 "           at least <n>% of the maximum heap size set with -M (default: 30%)",
-"  -c       Disable compaction",
+"  -c       Enable compaction for all major collections",
 "",
 "  -t<file> One-line GC statistics  (default file: <program>.stat)",
 "  -s<file> Summary  GC statistics  (with -Sstderr going to stderr)",
@@ -535,8 +536,18 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[])
     // Split arguments (argv) into PGM (argv) and RTS (rts_argv) parts
     //   argv[0] must be PGM argument -- leave in argv
 
-    for (mode = PGM; arg < total_arg && ! strequal("--RTS", argv[arg]); arg++) {
-       if (strequal("+RTS", argv[arg])) {
+    for (mode = PGM; arg < total_arg; arg++) {
+       // The '--RTS' argument disables all future +RTS ... -RTS processing.
+       if (strequal("--RTS", argv[arg])) {
+           arg++;
+           break;
+       }
+       // The '--' argument is passed through to the program, but
+       // disables all further +RTS ... -RTS processing.
+       else if (strequal("--", argv[arg])) {
+           break;
+       }
+       else if (strequal("+RTS", argv[arg])) {
            mode = RTS;
        }
        else if (strequal("-RTS", argv[arg])) {
@@ -552,11 +563,9 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[])
          barf("too many RTS arguments (max %d)", MAX_RTS_ARGS-1);
        }
     }
-    if (arg < total_arg) {
-       /* arg must be --RTS; process remaining program arguments */
-       while (++arg < total_arg) {
-           argv[(*argc)++] = argv[arg];
-       }
+    // process remaining program arguments
+    for (; arg < total_arg; arg++) {
+       argv[(*argc)++] = argv[arg];
     }
     argv[*argc] = (char *) 0;
     rts_argv[*rts_argc] = (char *) 0;
@@ -654,11 +663,10 @@ error = rtsTrue;
 
              case 'c':
                  if (rts_argv[arg][2] != '\0') {
-                     RtsFlags.GcFlags.compact = rtsTrue;
                      RtsFlags.GcFlags.compactThreshold =
                          atof(rts_argv[arg]+2);
                  } else {
-                     RtsFlags.GcFlags.compact = rtsFalse;
+                     RtsFlags.GcFlags.compact = rtsTrue;
                  }
                  break;
 
@@ -775,9 +783,6 @@ error = rtsTrue;
              /* =========== PROFILING ========================== */
 
              case 'P': /* detailed cost centre profiling (time/alloc) */
-               COST_CENTRE_USING_BUILD_ONLY(
-               RtsFlags.CcFlags.doCostCentres = COST_CENTRES_VERBOSE;
-               )
              case 'p': /* cost centre profiling (time/alloc) */
                COST_CENTRE_USING_BUILD_ONLY(
                switch (rts_argv[arg][2]) {
@@ -788,8 +793,14 @@ error = rtsTrue;
                    RtsFlags.CcFlags.doCostCentres = COST_CENTRES_ALL;
                    break;
                  default:
-                   RtsFlags.CcFlags.doCostCentres = COST_CENTRES_SUMMARY;
-                   break;
+                     if (rts_argv[arg][1] == 'P') {
+                         RtsFlags.CcFlags.doCostCentres =
+                             COST_CENTRES_VERBOSE;
+                     } else {
+                         RtsFlags.CcFlags.doCostCentres =
+                             COST_CENTRES_SUMMARY;
+                     }
+                     break;
                }
                ) break;
 
@@ -1991,6 +2002,7 @@ set_debug_options(nat n) {
         case 9: RtsFlags.DebugFlags.prof        = rtsTrue; break;
         case 10:  RtsFlags.DebugFlags.gran       = rtsTrue; break;
         case 11:  RtsFlags.DebugFlags.par        = rtsTrue; break;
+        case 12:  RtsFlags.DebugFlags.linker     = rtsTrue; break;
         default: barf("set_debug_options: only %d debug options expected",
                      MAX_DEBUG_OPTION);
       } /* switch */