[project @ 2000-12-04 12:31:19 by simonmar]

[ghc-hetmet.git] / ghc / rts / RtsFlags.h

diff --git a/ghc/rts/RtsFlags.h b/ghc/rts/RtsFlags.h
index c153b89..feef33b 100644 (file)
--- a/ghc/rts/RtsFlags.h
+++ b/ghc/rts/RtsFlags.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.h,v 1.23 2000/03/31 03:09:36 hwloidl Exp $
+ * $Id: RtsFlags.h,v 1.29 2000/12/04 12:31:21 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -32,11 +32,13 @@ struct GC_FLAGS {
     nat     generations;
     nat     steps;
 
-    rtsBool forceGC; /* force a major GC every <interval> bytes */
-    int            forcingInterval; /* actually, stored as a number of *words* */
     rtsBool ringBell;
 
     rtsBool squeezeUpdFrames;
+
+#ifdef RTS_GTK_FRONTPANEL
+    rtsBool frontpanel;
+#endif
 };
 
 /* Hack: this struct uses bitfields so that we can use a binary arg
@@ -61,9 +63,12 @@ struct DEBUG_FLAGS {
   rtsBool prof        : 1; /* 512 */
   rtsBool gran        : 1; /* 1024 */
   rtsBool par         : 1; /* 2048 */
+
+  /* The object linker */
+  rtsBool linker      : 1; /* 4096 */
 };
 
-#define MAX_DEBUG_OPTION     11
+#define MAX_DEBUG_OPTION     12
 #define DEBUG_MASK(n)        ((nat)(ldexp(1,n)))
 #define MAX_DEBUG_MASK       ((nat)(ldexp(1,(MAX_DEBUG_OPTION+1))-1))
 
@@ -78,7 +83,6 @@ struct COST_CENTRE_FLAGS {
 # define COST_CENTRES_ALL      3
 # define COST_CENTRES_XML       4
 
-    int            ctxtSwitchTicks; /* derived */
     int            profilerTicks;   /* derived */
     int            msecsPerTick;    /* derived */
 };
@@ -102,12 +106,6 @@ struct PROFILING_FLAGS {
 # define DESCRchar 'D'
 # define TYPEchar  'Y'
 # define TIMEchar  'T'
-
-    char *ccSelector;
-    char *modSelector;
-    char *descrSelector;
-    char *typeSelector;
-    char *kindSelector;
 };
 #elif defined(DEBUG)
 # define NO_HEAP_PROFILING     0
@@ -119,7 +117,8 @@ struct PROFILING_FLAGS {
 #endif /* DEBUG || PROFILING */
 
 struct CONCURRENT_FLAGS {
-  int ctxtSwitchTime; /* in milliseconds */
+    int ctxtSwitchTime;                /* in milliseconds */
+    int ctxtSwitchTicks;       /* derived */
 };
 
 #ifdef PAR