X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTrace.c;h=f2f9e815498b66d3422047366b31307a93e810c0;hb=26f4bfc82f2b2359259578e9c54d476fc2de650f;hp=8991033213312d6fa90d939f333dc0a5c57af8f3;hpb=3db8a9be9f89fe76e0a27f24ab02977974b6613f;p=ghc-hetmet.git diff --git a/rts/Trace.c b/rts/Trace.c index 8991033..f2f9e81 100644 --- a/rts/Trace.c +++ b/rts/Trace.c @@ -9,10 +9,11 @@ // external headers #include "Rts.h" -#ifdef TRACING - // internal headers #include "Trace.h" + +#ifdef TRACING + #include "GetTime.h" #include "Stats.h" #include "eventlog/EventLog.h" @@ -63,7 +64,6 @@ void initTracing (void) 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); @@ -80,29 +80,12 @@ void initTracing (void) 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(); @@ -123,6 +106,14 @@ void freeTracing (void) } } +void resetTracing (void) +{ + if (eventlog_enabled) { + abortEventLogging(); // abort eventlog inherited from parent + initEventLogging(); // child starts its own eventlog + } +} + /* --------------------------------------------------------------------------- Emitting trace messages/events --------------------------------------------------------------------------- */ @@ -146,14 +137,26 @@ static char *thread_stop_reasons[] = { [ThreadYielding] = "yielding", [ThreadBlocked] = "blocked", [ThreadFinished] = "finished", - [THREAD_SUSPENDED_FOREIGN_CALL] = "suspended while making a foreign call" + [THREAD_SUSPENDED_FOREIGN_CALL] = "suspended while making a foreign call", + [6 + BlockedOnMVar] = "blocked on an MVar", + [6 + BlockedOnBlackHole] = "blocked on a black hole", + [6 + BlockedOnRead] = "blocked on a read operation", + [6 + BlockedOnWrite] = "blocked on a write operation", + [6 + BlockedOnDelay] = "blocked on a delay operation", + [6 + BlockedOnSTM] = "blocked on STM", + [6 + BlockedOnDoProc] = "blocked on asyncDoProc", + [6 + BlockedOnCCall] = "blocked on a foreign call", + [6 + BlockedOnCCall_Interruptible] = "blocked on a foreign call (interruptible)", + [6 + BlockedOnMsgThrowTo] = "blocked on throwTo", + [6 + ThreadMigrating] = "migrating" }; #endif #ifdef DEBUG static void traceSchedEvent_stderr (Capability *cap, EventTypeNum tag, StgTSO *tso, - StgWord64 other STG_UNUSED) + StgWord info1 STG_UNUSED, + StgWord info2 STG_UNUSED) { ACQUIRE_LOCK(&trace_utx); @@ -177,24 +180,29 @@ static void traceSchedEvent_stderr (Capability *cap, EventTypeNum tag, break; case EVENT_CREATE_SPARK_THREAD: // (cap, spark_thread) debugBelch("cap %d: creating spark thread %lu\n", - cap->no, (long)other); + cap->no, (long)info1); break; case EVENT_MIGRATE_THREAD: // (cap, thread, new_cap) debugBelch("cap %d: thread %lu migrating to cap %d\n", - cap->no, (lnat)tso->id, (int)other); + cap->no, (lnat)tso->id, (int)info1); break; case EVENT_STEAL_SPARK: // (cap, thread, victim_cap) debugBelch("cap %d: thread %lu stealing a spark from cap %d\n", - cap->no, (lnat)tso->id, (int)other); + cap->no, (lnat)tso->id, (int)info1); break; - case EVENT_THREAD_WAKEUP: // (cap, thread, other_cap) + case EVENT_THREAD_WAKEUP: // (cap, thread, info1_cap) debugBelch("cap %d: waking up thread %lu on cap %d\n", - cap->no, (lnat)tso->id, (int)other); + cap->no, (lnat)tso->id, (int)info1); break; case EVENT_STOP_THREAD: // (cap, thread, status) - debugBelch("cap %d: thread %lu stopped (%s)\n", - cap->no, (lnat)tso->id, thread_stop_reasons[other]); + if (info1 == 6 + BlockedOnBlackHole) { + debugBelch("cap %d: thread %lu stopped (blocked on black hole owned by thread %lu)\n", + cap->no, (lnat)tso->id, (long)info2); + } else { + debugBelch("cap %d: thread %lu stopped (%s)\n", + cap->no, (lnat)tso->id, thread_stop_reasons[info1]); + } break; case EVENT_SHUTDOWN: // (cap) debugBelch("cap %d: shutting down\n", cap->no); @@ -211,8 +219,17 @@ static void traceSchedEvent_stderr (Capability *cap, EventTypeNum tag, case EVENT_GC_END: // (cap) debugBelch("cap %d: finished GC\n", cap->no); break; + case EVENT_GC_IDLE: // (cap) + debugBelch("cap %d: GC idle\n", cap->no); + break; + case EVENT_GC_WORK: // (cap) + debugBelch("cap %d: GC working\n", cap->no); + break; + case EVENT_GC_DONE: // (cap) + debugBelch("cap %d: GC done\n", cap->no); + break; default: - debugBelch("cap %2d: thread %lu: event %d\n\n", + debugBelch("cap %d: thread %lu: event %d\n\n", cap->no, (lnat)tso->id, tag); break; } @@ -222,15 +239,27 @@ static void traceSchedEvent_stderr (Capability *cap, EventTypeNum tag, #endif void traceSchedEvent_ (Capability *cap, EventTypeNum tag, - StgTSO *tso, StgWord64 other) + StgTSO *tso, StgWord info1, StgWord info2) +{ +#ifdef DEBUG + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { + traceSchedEvent_stderr(cap, tag, tso, info1, info2); + } else +#endif + { + postSchedEvent(cap,tag,tso ? tso->id : 0, info1, info2); + } +} + +void traceEvent_ (Capability *cap, EventTypeNum tag) { #ifdef DEBUG - if (RtsFlags.TraceFlags.trace_stderr) { - traceSchedEvent_stderr(cap, tag, tso, other); + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { + traceSchedEvent_stderr(cap, tag, 0, 0, 0); } else #endif { - postSchedEvent(cap,tag,tso ? tso->id : 0,other); + postEvent(cap,tag); } } @@ -240,7 +269,7 @@ static void traceCap_stderr(Capability *cap, char *msg, va_list ap) ACQUIRE_LOCK(&trace_utx); tracePreface(); - debugBelch("cap %2d: ", cap->no); + debugBelch("cap %d: ", cap->no); vdebugBelch(msg,ap); debugBelch("\n"); @@ -254,7 +283,7 @@ void traceCap_(Capability *cap, char *msg, ...) va_start(ap,msg); #ifdef DEBUG - if (RtsFlags.TraceFlags.trace_stderr) { + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { traceCap_stderr(cap, msg, ap); } else #endif @@ -284,7 +313,7 @@ void trace_(char *msg, ...) va_start(ap,msg); #ifdef DEBUG - if (RtsFlags.TraceFlags.trace_stderr) { + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { trace_stderr(msg, ap); } else #endif @@ -295,10 +324,33 @@ void trace_(char *msg, ...) va_end(ap); } +static void traceFormatUserMsg(Capability *cap, char *msg, ...) +{ + va_list ap; + va_start(ap,msg); + +#ifdef DEBUG + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { + traceCap_stderr(cap, msg, ap); + } else +#endif + { + if (eventlog_enabled) { + postUserMsg(cap, msg, ap); + } + } + dtraceUserMsg(cap->no, msg); +} + +void traceUserMsg(Capability *cap, char *msg) +{ + traceFormatUserMsg(cap, "%s", msg); +} + void traceThreadStatus_ (StgTSO *tso USED_IF_DEBUG) { #ifdef DEBUG - if (RtsFlags.TraceFlags.trace_stderr) { + if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) { printThreadStatus(tso); } else #endif @@ -328,3 +380,15 @@ void traceEnd (void) #endif /* DEBUG */ #endif /* TRACING */ + +// If DTRACE is enabled, but neither DEBUG nor TRACING, we need a C land +// wrapper for the user-msg probe (as we can't expand that in PrimOps.cmm) +// +#if !defined(DEBUG) && !defined(TRACING) && defined(DTRACE) + +void dtraceUserMsgWrapper(Capability *cap, char *msg) +{ + dtraceUserMsg(cap->no, msg); +} + +#endif /* !defined(DEBUG) && !defined(TRACING) && defined(DTRACE) */