X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=7e836afefc6ca0c105f624bbfd2de410f115e492;hb=35a38acc6010d97b349092f9179c14d18f129e9b;hp=6f6f2c57464d9669c0dd401f1242ac2083c0d4e6;hpb=f922f05eea61f167abda6fb53c179190f8cef118;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 6f6f2c5..7e836af 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.
  *
@@ -156,7 +155,6 @@ void initRtsFlagsDefaults(void)
 #ifdef DEBUG
     RtsFlags.DebugFlags.scheduler	= rtsFalse;
     RtsFlags.DebugFlags.interpreter	= rtsFalse;
-    RtsFlags.DebugFlags.codegen		= rtsFalse;
     RtsFlags.DebugFlags.weak		= rtsFalse;
     RtsFlags.DebugFlags.gccafs		= rtsFalse;
     RtsFlags.DebugFlags.gc		= rtsFalse;
@@ -300,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 *
@@ -397,10 +398,12 @@ 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",
-"  -Dc  DEBUG: codegen",
 "  -Dw  DEBUG: weak",
 "  -DG  DEBUG: gccafs",
 "  -Dg  DEBUG: gc",
@@ -671,9 +674,6 @@ error = rtsTrue;
 		      case 'i':
 			  RtsFlags.DebugFlags.interpreter = rtsTrue;
 			  break;
-		      case 'c':
-			  RtsFlags.DebugFlags.codegen = rtsTrue;
-			  break;
 		      case 'w':
 			  RtsFlags.DebugFlags.weak = rtsTrue;
 			  break;
@@ -1032,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]);
@@ -1094,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 */