projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove "-dynload wrapper"; fixes trac #4275
[ghc-hetmet.git]
/
includes
/
rts
/
Flags.h
diff --git
a/includes/rts/Flags.h
b/includes/rts/Flags.h
index
733318a
..
8bfadaa
100644
(file)
--- a/
includes/rts/Flags.h
+++ b/
includes/rts/Flags.h
@@
-34,6
+34,7
@@
struct GC_FLAGS {
nat minAllocAreaSize; /* in *blocks* */
nat minOldGenSize; /* in *blocks* */
nat heapSizeSuggestion; /* in *blocks* */
nat minAllocAreaSize; /* in *blocks* */
nat minOldGenSize; /* in *blocks* */
nat heapSizeSuggestion; /* in *blocks* */
+ rtsBool heapSizeSuggestionAuto;
double oldGenFactor;
double pcFreeHeap;
double oldGenFactor;
double pcFreeHeap;
@@
-117,8
+118,12
@@
struct PROFILING_FLAGS {
};
};
+#define TRACE_NONE 0
+#define TRACE_EVENTLOG 1
+#define TRACE_STDERR 2
+
struct TRACE_FLAGS {
struct TRACE_FLAGS {
- rtsBool trace_stderr;
+ int tracing;
rtsBool timestamp; /* show timestamp in stderr output */
rtsBool scheduler; /* trace scheduler events */
rtsBool timestamp; /* show timestamp in stderr output */
rtsBool scheduler; /* trace scheduler events */
@@
-168,6
+173,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
@@
-176,6
+183,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