X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsFlags.h;h=348a8f52252ee76009b1590119d68051eb9af982;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hp=55b00bb2a0d5d0cc23f3004d21a771e80aee6661;hpb=11f6f411b4a15b333423715b41b498f5f7745933;p=ghc-hetmet.git

diff --git a/includes/RtsFlags.h b/includes/RtsFlags.h
index 55b00bb..348a8f5 100644
--- a/includes/RtsFlags.h
+++ b/includes/RtsFlags.h
@@ -60,6 +60,7 @@ struct DEBUG_FLAGS {
     rtsBool sanity;         /* 'S'   warning: might be expensive! */
     rtsBool stable;         /* 't' */
     rtsBool prof;           /* 'p' */
+    rtsBool eventlog;       /* 'e' */
     rtsBool gran;           /* 'r' */
     rtsBool par;            /* 'P' */
     rtsBool linker;         /* 'l'   the object linker */
@@ -67,6 +68,7 @@ struct DEBUG_FLAGS {
     rtsBool stm;            /* 'm' */
     rtsBool squeeze;        /* 'z'  stack squeezing & lazy blackholing */
     rtsBool hpc; 	    /* 'c' coverage */
+    rtsBool timestamp;          /* add timestamps to traces */
 };
 
 struct COST_CENTRE_FLAGS {
@@ -113,6 +115,12 @@ struct PROFILING_FLAGS {
 
 };
 
+#ifdef EVENTLOG
+struct EVENTLOG_FLAGS {
+  rtsBool doEventLogging;
+};
+#endif
+
 struct CONCURRENT_FLAGS {
     int ctxtSwitchTime;		/* in milliseconds */
     int ctxtSwitchTicks;	/* derived */
@@ -121,6 +129,7 @@ struct CONCURRENT_FLAGS {
 struct MISC_FLAGS {
     int tickInterval;     /* in milliseconds */
     rtsBool install_signal_handlers;
+    rtsBool machineReadable;
     StgWord linkerMemBase;       /* address to ask the OS for memory
                                   * for the linker, NULL ==> off */
 };
@@ -179,7 +188,11 @@ struct PAR_FLAGS {
   rtsBool        migrate;        /* migrate threads between capabilities */
   rtsBool        wakeupMigrate;  /* migrate a thread on wakeup */
   unsigned int	 maxLocalSparks;
-  nat            gcThreads;      /* number of threads for parallel GC */
+  rtsBool        parGcEnabled;   /* enable parallel GC */
+  rtsBool        parGcGen;       /* do parallel GC in this generation
+                                  * and higher only */
+  rtsBool        parGcLoadBalancing; /* do load-balancing in parallel GC */
+  rtsBool        setAffinity;    /* force thread affinity with CPUs */
 };
 #endif /* THREADED_RTS */
 
@@ -303,12 +316,6 @@ struct TICKY_FLAGS {
     FILE   *tickyFile;
 };
 
-struct TRACE_FLAGS {
-    rtsBool sched;		/* trace scheduler events for profiling */
-    rtsBool gc;                 /* trace GC events */
-    rtsBool timestamp;          /* add timestamps to traces */
-};
-
 #ifdef USE_PAPI
 #define MAX_PAPI_USER_EVENTS 8
 
@@ -337,8 +344,10 @@ typedef struct _RTS_FLAGS {
     struct DEBUG_FLAGS	     DebugFlags;
     struct COST_CENTRE_FLAGS CcFlags;
     struct PROFILING_FLAGS   ProfFlags;
+#ifdef EVENTLOG
+    struct EVENTLOG_FLAGS    EventLogFlags;
+#endif
     struct TICKY_FLAGS	     TickyFlags;
-    struct TRACE_FLAGS       TraceFlags;
 
 #if defined(THREADED_RTS) || defined(PAR)
     struct PAR_FLAGS	ParFlags;