projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup sweep and fix a bug in RTS flag processing.
[ghc-hetmet.git]
/
includes
/
rts
/
Flags.h
diff --git
a/includes/rts/Flags.h
b/includes/rts/Flags.h
index
e78bed2
..
b4e7b64
100644
(file)
--- a/
includes/rts/Flags.h
+++ b/
includes/rts/Flags.h
@@
-29,11
+29,14
@@
struct GC_FLAGS {
nat maxStkSize; /* in *words* */
nat initialStkSize; /* in *words* */
nat maxStkSize; /* in *words* */
nat initialStkSize; /* in *words* */
+ nat stkChunkSize; /* in *words* */
+ nat stkChunkBufferSize; /* in *words* */
nat maxHeapSize; /* in *blocks* */
nat minAllocAreaSize; /* in *blocks* */
nat minOldGenSize; /* in *blocks* */
nat heapSizeSuggestion; /* in *blocks* */
nat maxHeapSize; /* in *blocks* */
nat minAllocAreaSize; /* in *blocks* */
nat minOldGenSize; /* in *blocks* */
nat heapSizeSuggestion; /* in *blocks* */
+ rtsBool heapSizeSuggestionAuto;
double oldGenFactor;
double pcFreeHeap;
double oldGenFactor;
double pcFreeHeap;
@@
-145,8
+148,7
@@
struct MISC_FLAGS {
struct PAR_FLAGS {
nat nNodes; /* number of threads to run simultaneously */
rtsBool migrate; /* migrate threads between capabilities */
struct PAR_FLAGS {
nat nNodes; /* number of threads to run simultaneously */
rtsBool migrate; /* migrate threads between capabilities */
- rtsBool wakeupMigrate; /* migrate a thread on wakeup */
- unsigned int maxLocalSparks;
+ unsigned int maxLocalSparks;
rtsBool parGcEnabled; /* enable parallel GC */
unsigned int parGcGen; /* do parallel GC in this generation
* and higher only */
rtsBool parGcEnabled; /* enable parallel GC */
unsigned int parGcGen; /* do parallel GC in this generation
* and higher only */
@@
-172,6
+174,8
@@
struct PAPI_FLAGS {
nat eventType; /* The type of events to count */
nat numUserEvents;
char * userEvents[MAX_PAPI_USER_EVENTS];
nat eventType; /* The type of events to count */
nat numUserEvents;
char * userEvents[MAX_PAPI_USER_EVENTS];
+ /* Allow user to enter either PAPI preset or native events */
+ nat userEventsKind[MAX_PAPI_USER_EVENTS];
};
#define PAPI_FLAG_CACHE_L1 1
};
#define PAPI_FLAG_CACHE_L1 1
@@
-180,6
+184,8
@@
struct PAPI_FLAGS {
#define PAPI_FLAG_STALLS 4
#define PAPI_FLAG_CB_EVENTS 5
#define PAPI_USER_EVENTS 6
#define PAPI_FLAG_STALLS 4
#define PAPI_FLAG_CB_EVENTS 5
#define PAPI_USER_EVENTS 6
+#define PAPI_PRESET_EVENT_KIND 0
+#define PAPI_NATIVE_EVENT_KIND 1
#endif
#endif
@@
-213,13
+219,6
@@
extern RTS_FLAGS RtsFlags[];
extern RTS_FLAGS RtsFlags;
#endif
extern RTS_FLAGS RtsFlags;
#endif
-/* Routines that operate-on/to-do-with RTS flags: */
-
-void initRtsFlagsDefaults(void);
-void setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]);
-void setProgName(char *argv[]);
-
-
/*
* The printf formats are here, so we are less likely to make
* overly-long filenames (with disastrous results). No more than 128
/*
* The printf formats are here, so we are less likely to make
* overly-long filenames (with disastrous results). No more than 128