X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=0618386ae5a396d35bb8fc6225bf1e4c59c3dbe4;hb=a57e55b095c48d8ca27b2ec13f4d138655618577;hp=439dfd78977a6b7aa621f4a13babd2ade429efb0;hpb=8db56c8606e6c0e89a87d34c3f67124f1e8b988e;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 439dfd7..0618386 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -147,6 +147,7 @@ void initRtsFlagsDefaults(void)
 #endif
     RtsFlags.GcFlags.compact            = rtsFalse;
     RtsFlags.GcFlags.compactThreshold   = 30.0;
+    RtsFlags.GcFlags.sweep              = rtsFalse;
 #ifdef RTS_GTK_FRONTPANEL
     RtsFlags.GcFlags.frontpanel         = rtsFalse;
 #endif
@@ -317,6 +318,7 @@ void initRtsFlagsDefaults(void)
 
     RtsFlags.TraceFlags.timestamp	= rtsFalse;
     RtsFlags.TraceFlags.sched 		= rtsFalse;
+    RtsFlags.TraceFlags.gc 		= rtsFalse;
 
 #ifdef USE_PAPI
     /* By default no special measurements taken */
@@ -352,6 +354,7 @@ usage_text[] = {
 "  -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       Enable compaction for all major collections",
+"  -w       Use mark-region for the oldest generation (experimental)",
 #if defined(THREADED_RTS)
 "  -I<sec>  Perform full GC after <sec> idle time (default: 0.3, 0 == off)",
 #endif
@@ -446,7 +449,7 @@ usage_text[] = {
 "",
 #endif /* DEBUG */
 #if defined(THREADED_RTS) && !defined(NOSMP)
-"  -N<n>     Use <n> OS threads (default: 1)",
+"  -N<n>     Use <n> OS threads (default: 1) (also sets -g)",
 "  -g<n>     Use <n> OS threads for GC (default: 1)",
 "  -qm       Don't automatically migrate threads between CPUs",
 "  -qw       Migrate a thread to the current CPU when it is woken up",
@@ -749,6 +752,10 @@ error = rtsTrue;
 		  }
 		  break;
 
+              case 'w':
+		RtsFlags.GcFlags.sweep = rtsTrue;
+		break;
+
 	      case 'F':
 	        RtsFlags.GcFlags.oldGenFactor = atof(rts_argv[arg]+2);
 	      
@@ -870,10 +877,6 @@ error = rtsTrue;
 	      case 'H':
 		RtsFlags.GcFlags.heapSizeSuggestion = 
 		  decode(rts_argv[arg]+2) / BLOCK_SIZE;
-
-		if (RtsFlags.GcFlags.heapSizeSuggestion <= 0) {
-		  bad_option(rts_argv[arg]);
-		}
 		break;
 
 #ifdef RTS_GTK_FRONTPANEL
@@ -1124,10 +1127,18 @@ error = rtsTrue;
 		if (rts_argv[arg][2] != '\0') {
 		    RtsFlags.ParFlags.nNodes
 		      = strtol(rts_argv[arg]+2, (char **) NULL, 10);
+                    // set -g at the same time as -N by default
+		    RtsFlags.ParFlags.gcThreads = RtsFlags.ParFlags.nNodes;
 		    if (RtsFlags.ParFlags.nNodes <= 0) {
 		      errorBelch("bad value for -N");
 		      error = rtsTrue;
 		    }
+#if defined(PROFILING)
+                    if (RtsFlags.ParFlags.nNodes > 1) {
+                        errorBelch("bad option %s: only -N1 is supported with profiling", rts_argv[arg]);
+		      error = rtsTrue;
+                    }
+#endif
 		}
 		) break;
 
@@ -1140,12 +1151,6 @@ error = rtsTrue;
 		      errorBelch("bad value for -g");
 		      error = rtsTrue;
 		    }
-#if defined(PROFILING)
-                    if (RtsFlags.ParFlags.nNodes > 1) {
-                        errorBelch("bad option %s: only -N1 is supported with profiling", rts_argv[arg]);
-		      error = rtsTrue;
-                    }
-#endif
 		}
 		) break;
 
@@ -1225,6 +1230,9 @@ error = rtsTrue;
 		case 's':
 		    RtsFlags.TraceFlags.sched = rtsTrue;
 		    break;
+		case 'g':
+		    RtsFlags.TraceFlags.gc = rtsTrue;
+		    break;
 		default:
 		    errorBelch("unknown RTS option: %s",rts_argv[arg]);
 		    error = rtsTrue;
@@ -2335,7 +2343,7 @@ open_stats_file (
 {
     FILE *f = NULL;
 
-    if (strequal(rts_argv[arg]+2, "stderr")) { /* use debugBelch */
+    if (strequal(rts_argv[arg]+2, "stderr") || strequal(rts_argv[arg]+2, "-")) {
         f = NULL; /* NULL means use debugBelch */
     } else {
 	if (rts_argv[arg][2] != '\0') {  /* stats file specified */