X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=2bb061ad806b92bb1068bfad0ecbe9503c3b801c;hb=edad06244b0a542d6b5c9ce3f3cd72941c5be804;hp=78c8d2a6b95aa6c4d7af5dc0f5ca4e0c9a572cce;hpb=04a046e8fcf175cd00d3ac87510b0b594c8f91e1;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 78c8d2a..2bb061a 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -1,8 +1,7 @@
-
 /* -----------------------------------------------------------------------------
  *
  * (c) The AQUA Project, Glasgow University, 1994-1997
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2006
  *
  * Functions for parsing the argument list.
  *
@@ -299,6 +298,9 @@ void initRtsFlagsDefaults(void)
     RtsFlags.TickyFlags.showTickyStats	 = rtsFalse;
     RtsFlags.TickyFlags.tickyFile	 = NULL;
 #endif
+
+    RtsFlags.TraceFlags.timestamp	= rtsFalse;
+    RtsFlags.TraceFlags.sched 		= rtsFalse;
 }
 
 static const char *
@@ -396,6 +398,9 @@ usage_text[] = {
 "                (0 or no argument means switch as often as possible)",
 "                the default is .02 sec; resolution is .02 sec",
 "",
+"  -vs       Trace scheduler events (see also -Ds with -debug)",
+"  -vt       Time-stamp trace messages",
+"",
 #if defined(DEBUG)
 "  -Ds  DEBUG: scheduler",
 "  -Di  DEBUG: interpreter",
@@ -413,7 +418,7 @@ usage_text[] = {
 "  -Dz  DEBUG: stack squezing",
 "",
 #endif /* DEBUG */
-#if defined(THREADED_RTS)
+#if defined(THREADED_RTS) && !defined(NOSMP)
 "  -N<n>     Use <n> OS threads (default: 1)",
 "  -qm       Don't automatically migrate threads between CPUs",
 "  -qw       Migrate a thread to the current CPU when it is woken up",
@@ -1014,7 +1019,7 @@ error = rtsTrue;
 		}
     	    	break;
 
-#ifdef THREADED_RTS
+#if defined(THREADED_RTS) && !defined(NOSMP)
 	      case 'N':
 		THREADED_BUILD_ONLY(
 		if (rts_argv[arg][2] != '\0') {
@@ -1027,7 +1032,7 @@ error = rtsTrue;
 		}
 		) break;
 
-	    case 'q':
+	      case 'q':
 		    switch (rts_argv[arg][2]) {
 		    case '\0':
 			errorBelch("incomplete RTS option: %s",rts_argv[arg]);
@@ -1089,6 +1094,27 @@ error = rtsTrue;
 		}
 	        ) break;
 
+	      /* =========== TRACING ---------=================== */
+
+	      case 'v':
+                switch(rts_argv[arg][2]) {
+		case '\0':
+		    errorBelch("incomplete RTS option: %s",rts_argv[arg]);
+		    error = rtsTrue;
+		    break;
+		case 't':
+		    RtsFlags.TraceFlags.timestamp = rtsTrue;
+		    break;
+		case 's':
+		    RtsFlags.TraceFlags.sched = rtsTrue;
+		    break;
+		default:
+		    errorBelch("unknown RTS option: %s",rts_argv[arg]);
+		    error = rtsTrue;
+		    break;
+		}
+                break;
+
 	      /* =========== EXTENDED OPTIONS =================== */
 
               case 'x': /* Extend the argument space */