X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsFlags.h;h=a4c6d9ba58bb45ceecb16d4f8847f92f392253dc;hb=33a84b8c79f0ccd2400996a0e571b0659d4c16ed;hp=1d4574894f8a6f2fe4236c6d6e5631da7abdbab4;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsFlags.h b/ghc/includes/RtsFlags.h
index 1d45748..a4c6d9b 100644
--- a/ghc/includes/RtsFlags.h
+++ b/ghc/includes/RtsFlags.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.h,v 1.46 2004/08/13 13:09:29 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -42,24 +41,27 @@ struct GC_FLAGS {
 
     rtsBool ringBell;
     rtsBool frontpanel;
+
+    int idleGCDelayTicks;	/* in milliseconds */
 };
 
 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'
-    rtsBool block_alloc;    // 'b'
-    rtsBool sanity;         // 'S'   warning: might be expensive!
-    rtsBool stable;         // 't'
-    rtsBool prof;           // 'p'
-    rtsBool gran;           // 'r'
-    rtsBool par;            // 'P'
-    rtsBool linker;         // 'l'   the object linker
-    rtsBool apply;          // 'a'
+    /* 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' */
+    rtsBool block_alloc;    /* 'b' */
+    rtsBool sanity;         /* 'S'   warning: might be expensive! */
+    rtsBool stable;         /* 't' */
+    rtsBool prof;           /* 'p' */
+    rtsBool gran;           /* 'r' */
+    rtsBool par;            /* 'P' */
+    rtsBool linker;         /* 'l'   the object linker */
+    rtsBool apply;          /* 'a' */
+    rtsBool stm;            /* 'm' */
 };
 
 struct COST_CENTRE_FLAGS {
@@ -237,8 +239,8 @@ struct GRAN_FLAGS {
   struct GRAN_COST_FLAGS Costs;          /* cost metric for simulation */
   struct GRAN_DEBUG_FLAGS Debug;         /* debugging options */
 
-  nat  maxThreads;              // ToDo: share with SMP and GUM
-  // rtsBool labelling;
+  nat  maxThreads;              /* ToDo: share with SMP and GUM */
+  /* rtsBool labelling; */
   nat  packBufferSize;
   nat  packBufferSize_internal;
 
@@ -274,9 +276,9 @@ struct GRAN_FLAGS {
   rtsBool RandomSteal;        /* steal spark/thread from random proc */
   rtsBool NoForward;        /* no forwarding of fetch messages */
 
-  // unsigned int	    debug;
-  //  rtsBool event_trace;
-  //  rtsBool event_trace_all;
+  /* unsigned int	    debug; */
+  /*  rtsBool event_trace; */
+  /*  rtsBool event_trace_all; */
 };
 #endif /* GRAN */
 
@@ -289,7 +291,7 @@ struct TICKY_FLAGS {
 /* Put them together: */
 
 typedef struct _RTS_FLAGS {
-	// The first portion of RTS_FLAGS is invariant.
+    /* The first portion of RTS_FLAGS is invariant. */
     struct GC_FLAGS	     GcFlags;
     struct CONCURRENT_FLAGS  ConcFlags;
     struct DEBUG_FLAGS	     DebugFlags;
@@ -308,7 +310,7 @@ typedef struct _RTS_FLAGS {
 #ifdef COMPILING_RTS_MAIN
 extern DLLIMPORT RTS_FLAGS RtsFlags;
 #elif IN_STG_CODE
-// Hack because the C code generator can't generate '&label'.
+/* Hack because the C code generator can't generate '&label'. */
 extern RTS_FLAGS RtsFlags[];
 #else
 extern RTS_FLAGS RtsFlags;
@@ -316,8 +318,10 @@ extern RTS_FLAGS RtsFlags;
 
 /* Routines that operate-on/to-do-with RTS flags: */
 
-void initRtsFlagsDefaults(void);
-void setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]);
+extern void initRtsFlagsDefaults(void);
+extern void setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]);
+extern void setProgName(char *argv[]);
+
 
 /*
  * The printf formats are here, so we are less likely to make