diff --git a/src/cmd/trace/trace.go b/src/cmd/trace/trace.go index 7d38ab0799..d87a5bac38 100644 --- a/src/cmd/trace/trace.go +++ b/src/cmd/trace/trace.go @@ -362,7 +362,7 @@ func generateTrace(params *traceParams) ViewerData { if ctx.gtrace { continue } - ctx.emitSlice(ev, "MARK") + ctx.emitSlice(ev, "MARK TERMINATION") case trace.EvGCScanDone: case trace.EvGCSweepStart: ctx.emitSlice(ev, "SWEEP") diff --git a/src/internal/trace/parser.go b/src/internal/trace/parser.go index 527aba7ab4..fa62eccf72 100644 --- a/src/internal/trace/parser.go +++ b/src/internal/trace/parser.go @@ -858,8 +858,8 @@ const ( EvProcStop = 6 // stop of P [timestamp] EvGCStart = 7 // GC start [timestamp, seq, stack id] EvGCDone = 8 // GC done [timestamp] - EvGCScanStart = 9 // GC scan start [timestamp] - EvGCScanDone = 10 // GC scan done [timestamp] + EvGCScanStart = 9 // GC mark termination start [timestamp] + EvGCScanDone = 10 // GC mark termination done [timestamp] EvGCSweepStart = 11 // GC sweep start [timestamp, stack id] EvGCSweepDone = 12 // GC sweep done [timestamp] EvGoCreate = 13 // goroutine creation [timestamp, new goroutine id, new stack id, stack id] diff --git a/src/runtime/trace.go b/src/runtime/trace.go index 707e4c617b..b64debcac4 100644 --- a/src/runtime/trace.go +++ b/src/runtime/trace.go @@ -28,8 +28,8 @@ const ( traceEvProcStop = 6 // stop of P [timestamp] traceEvGCStart = 7 // GC start [timestamp, seq, stack id] traceEvGCDone = 8 // GC done [timestamp] - traceEvGCScanStart = 9 // GC scan start [timestamp] - traceEvGCScanDone = 10 // GC scan done [timestamp] + traceEvGCScanStart = 9 // GC mark termination start [timestamp] + traceEvGCScanDone = 10 // GC mark termination done [timestamp] traceEvGCSweepStart = 11 // GC sweep start [timestamp, stack id] traceEvGCSweepDone = 12 // GC sweep done [timestamp] traceEvGoCreate = 13 // goroutine creation [timestamp, new goroutine id, new stack id, stack id]