X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsFlags.h;h=88a634609820bca623bc261822fbf53ba9cad194;hb=2fbab1a0f1a017799e8f5130bdf1078060623f29;hp=17d23638e711bdffffe15d25d30495dddf980dd4;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/includes/RtsFlags.h b/includes/RtsFlags.h
index 17d2363..88a6346 100644
--- a/includes/RtsFlags.h
+++ b/includes/RtsFlags.h
@@ -42,14 +42,15 @@ struct GC_FLAGS {
     rtsBool ringBell;
     rtsBool frontpanel;
 
-    int idleGCDelayTicks;	/* in milliseconds */
+    int idleGCDelayTime;	/* in milliseconds */
+
+    StgWord heapBase;           /* address to ask the OS for memory */
 };
 
 struct DEBUG_FLAGS {  
     /* flags to control debugging output & extra checking in various subsystems */
     rtsBool scheduler;      /* 's' */
     rtsBool interpreter;    /* 'i' */
-    rtsBool codegen;        /* 'c' */
     rtsBool weak;           /* 'w' */
     rtsBool gccafs;         /* 'G' */
     rtsBool gc;             /* 'g' */
@@ -63,6 +64,7 @@ struct DEBUG_FLAGS {
     rtsBool apply;          /* 'a' */
     rtsBool stm;            /* 'm' */
     rtsBool squeeze;        /* 'z'  stack squeezing & lazy blackholing */
+    rtsBool hpc; 	    /* 'c' coverage */
 };
 
 struct COST_CENTRE_FLAGS {
@@ -86,8 +88,7 @@ struct PROFILING_FLAGS {
 # define HEAP_BY_RETAINER       6
 # define HEAP_BY_LDV            7
 
-# define HEAP_BY_INFOPTR        1      /* DEBUG only */
-# define HEAP_BY_CLOSURE_TYPE   2      /* DEBUG only */
+# define HEAP_BY_CLOSURE_TYPE   8
 
     nat                 profileInterval;      /* delta between samples (in ms) */
     nat                 profileIntervalTicks; /* delta between samples (in 'ticks') */
@@ -98,6 +99,8 @@ struct PROFILING_FLAGS {
 
     nat                 maxRetainerSetSize;
 
+    nat                 ccsLength;
+
     char*               modSelector;
     char*               descrSelector;
     char*               typeSelector;
@@ -113,6 +116,11 @@ struct CONCURRENT_FLAGS {
     int ctxtSwitchTicks;	/* derived */
 };
 
+struct MISC_FLAGS {
+    int tickInterval;     /* in milliseconds */
+    rtsBool install_signal_handlers;
+};
+
 #ifdef PAR
 /* currently the same as GRAN_STATS_FLAGS */
 struct PAR_STATS_FLAGS {
@@ -290,17 +298,36 @@ struct TICKY_FLAGS {
     FILE   *tickyFile;
 };
 
+struct TRACE_FLAGS {
+    rtsBool sched;		/* trace scheduler events for profiling */
+    rtsBool timestamp;          /* add timestamps to traces */
+};
 
 /* Put them together: */
 
+#ifdef USE_PAPI
+struct PAPI_FLAGS {
+    nat     eventType;          /* The type of events to count */
+};
+
+#define PAPI_FLAG_CACHE_L1 1
+#define PAPI_FLAG_CACHE_L2 2
+#define PAPI_FLAG_BRANCH 3
+#define PAPI_FLAG_STALLS 4
+#define PAPI_FLAG_CB_EVENTS 5
+
+#endif
+
 typedef struct _RTS_FLAGS {
     /* The first portion of RTS_FLAGS is invariant. */
     struct GC_FLAGS	     GcFlags;
     struct CONCURRENT_FLAGS  ConcFlags;
+    struct MISC_FLAGS        MiscFlags;
     struct DEBUG_FLAGS	     DebugFlags;
     struct COST_CENTRE_FLAGS CcFlags;
     struct PROFILING_FLAGS   ProfFlags;
     struct TICKY_FLAGS	     TickyFlags;
+    struct TRACE_FLAGS       TraceFlags;
 
 #if defined(THREADED_RTS) || defined(PAR)
     struct PAR_FLAGS	ParFlags;
@@ -308,6 +335,9 @@ typedef struct _RTS_FLAGS {
 #ifdef GRAN
     struct GRAN_FLAGS	GranFlags;
 #endif
+#ifdef USE_PAPI
+    struct PAPI_FLAGS   PapiFlags;
+#endif
 } RTS_FLAGS;
 
 #ifdef COMPILING_RTS_MAIN