projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ghc-cabal now adds the language flag being used
[ghc-hetmet.git]
/
rts
/
Trace.h
diff --git
a/rts/Trace.h
b/rts/Trace.h
index
f8b6ad4
..
27de60e
100644
(file)
--- a/
rts/Trace.h
+++ b/
rts/Trace.h
@@
-16,7
+16,7
@@
#include "RtsProbes.h"
#endif /* defined(DTRACE) */
#include "RtsProbes.h"
#endif /* defined(DTRACE) */
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
// -----------------------------------------------------------------------------
// EventLog API
// -----------------------------------------------------------------------------
// EventLog API
@@
-27,6
+27,7
@@
BEGIN_RTS_PRIVATE
void initTracing (void);
void endTracing (void);
void freeTracing (void);
void initTracing (void);
void endTracing (void);
void freeTracing (void);
+void resetTracing (void);
#endif /* TRACING */
#endif /* TRACING */
@@
-135,6
+136,15
@@
void traceUserMsg(Capability *cap, char *msg);
#define debugTrace(class, str, ...) /* nothing */
#endif
#define debugTrace(class, str, ...) /* nothing */
#endif
+#ifdef DEBUG
+#define debugTraceCap(class, cap, msg, ...) \
+ if (RTS_UNLIKELY(class)) { \
+ traceCap_(cap, msg, ##__VA_ARGS__); \
+ }
+#else
+#define debugTraceCap(class, cap, str, ...) /* nothing */
+#endif
+
/*
* Emit a message/event describing the state of a thread
*/
/*
* Emit a message/event describing the state of a thread
*/
@@
-152,6
+162,7
@@
void traceThreadStatus_ (StgTSO *tso);
#define traceCap(class, cap, msg, ...) /* nothing */
#define trace(class, msg, ...) /* nothing */
#define debugTrace(class, str, ...) /* nothing */
#define traceCap(class, cap, msg, ...) /* nothing */
#define trace(class, msg, ...) /* nothing */
#define debugTrace(class, str, ...) /* nothing */
+#define debugTraceCap(class, cap, str, ...) /* nothing */
#define traceThreadStatus(class, tso) /* nothing */
#endif /* TRACING */
#define traceThreadStatus(class, tso) /* nothing */
#endif /* TRACING */
@@
-254,7
+265,7
@@
void dtraceUserMsgWrapper(Capability *cap, char *msg);
INLINE_HEADER void traceEventCreateThread(Capability *cap STG_UNUSED,
StgTSO *tso STG_UNUSED)
{
INLINE_HEADER void traceEventCreateThread(Capability *cap STG_UNUSED,
StgTSO *tso STG_UNUSED)
{
- traceSchedEvent(cap, EVENT_CREATE_THREAD, tso, tso->stack_size);
+ traceSchedEvent(cap, EVENT_CREATE_THREAD, tso, tso->stackobj->stack_size);
dtraceCreateThread((EventCapNo)cap->no, (EventThreadID)tso->id);
}
dtraceCreateThread((EventCapNo)cap->no, (EventThreadID)tso->id);
}
@@
-387,6
+398,6
@@
INLINE_HEADER void traceEventGcDone(Capability *cap STG_UNUSED)
dtraceGcDone((EventCapNo)cap->no);
}
dtraceGcDone((EventCapNo)cap->no);
}
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TRACE_H */
#endif /* TRACE_H */