projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #3578: return a dummy result when an STM transaction is aborted
[ghc-hetmet.git]
/
rts
/
Trace.c
diff --git
a/rts/Trace.c
b/rts/Trace.c
index
8991033
..
81a2eb2
100644
(file)
--- a/
rts/Trace.c
+++ b/
rts/Trace.c
@@
-63,7
+63,6
@@
void initTracing (void)
class = RtsFlags.DebugFlags.name ? 1 : 0;
DEBUG_FLAG(scheduler, DEBUG_sched);
class = RtsFlags.DebugFlags.name ? 1 : 0;
DEBUG_FLAG(scheduler, DEBUG_sched);
- DEBUG_FLAG(scheduler, TRACE_sched); // -Ds enabled all sched events
DEBUG_FLAG(interpreter, DEBUG_interp);
DEBUG_FLAG(weak, DEBUG_weak);
DEBUG_FLAG(interpreter, DEBUG_interp);
DEBUG_FLAG(weak, DEBUG_weak);
@@
-80,29
+79,12
@@
void initTracing (void)
DEBUG_FLAG(sparks, DEBUG_sparks);
#endif
DEBUG_FLAG(sparks, DEBUG_sparks);
#endif
-#define TRACE_FLAG(name, class) \
- class = RtsFlags.TraceFlags.name ? 1 : 0;
+ // -Ds turns on scheduler tracing too
+ TRACE_sched =
+ RtsFlags.TraceFlags.scheduler ||
+ RtsFlags.DebugFlags.scheduler;
- TRACE_FLAG(scheduler, TRACE_sched);
-
- eventlog_enabled = !RtsFlags.TraceFlags.trace_stderr && (
- TRACE_sched
-#ifdef DEBUG
- | DEBUG_sched
- | DEBUG_interp
- | DEBUG_weak
- | DEBUG_gccafs
- | DEBUG_gc
- | DEBUG_block_alloc
- | DEBUG_sanity
- | DEBUG_stable
- | DEBUG_stm
- | DEBUG_prof
- | DEBUG_linker
- | DEBUG_squeeze
- | DEBUG_hpc
-#endif
- );
+ eventlog_enabled = RtsFlags.TraceFlags.tracing == TRACE_EVENTLOG;
if (eventlog_enabled) {
initEventLogging();
if (eventlog_enabled) {
initEventLogging();
@@
-225,7
+207,7
@@
void traceSchedEvent_ (Capability *cap, EventTypeNum tag,
StgTSO *tso, StgWord64 other)
{
#ifdef DEBUG
StgTSO *tso, StgWord64 other)
{
#ifdef DEBUG
- if (RtsFlags.TraceFlags.trace_stderr) {
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
traceSchedEvent_stderr(cap, tag, tso, other);
} else
#endif
traceSchedEvent_stderr(cap, tag, tso, other);
} else
#endif
@@
-254,7
+236,7
@@
void traceCap_(Capability *cap, char *msg, ...)
va_start(ap,msg);
#ifdef DEBUG
va_start(ap,msg);
#ifdef DEBUG
- if (RtsFlags.TraceFlags.trace_stderr) {
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
traceCap_stderr(cap, msg, ap);
} else
#endif
traceCap_stderr(cap, msg, ap);
} else
#endif
@@
-284,7
+266,7
@@
void trace_(char *msg, ...)
va_start(ap,msg);
#ifdef DEBUG
va_start(ap,msg);
#ifdef DEBUG
- if (RtsFlags.TraceFlags.trace_stderr) {
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
trace_stderr(msg, ap);
} else
#endif
trace_stderr(msg, ap);
} else
#endif
@@
-295,10
+277,24
@@
void trace_(char *msg, ...)
va_end(ap);
}
va_end(ap);
}
+void traceUserMsg(Capability *cap, char *msg)
+{
+#ifdef DEBUG
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
+ traceCap_stderr(cap, msg, NULL);
+ } else
+#endif
+ {
+ if (eventlog_enabled) {
+ postUserMsg(cap, msg);
+ }
+ }
+}
+
void traceThreadStatus_ (StgTSO *tso USED_IF_DEBUG)
{
#ifdef DEBUG
void traceThreadStatus_ (StgTSO *tso USED_IF_DEBUG)
{
#ifdef DEBUG
- if (RtsFlags.TraceFlags.trace_stderr) {
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
printThreadStatus(tso);
} else
#endif
printThreadStatus(tso);
} else
#endif