diff options
| author | Hana Kim <hakim@google.com> | 2018-01-26 10:18:16 -0500 |
|---|---|---|
| committer | Hyang-Ah Hana Kim <hyangah@gmail.com> | 2018-02-21 20:13:47 +0000 |
| commit | f42418b25da382382a35730eff68fd27d049c581 (patch) | |
| tree | 6c1987c0390f1234d726dc84900ce0f019754908 /src/cmd/trace/annotations.go | |
| parent | cacf8127e3ce1b0a69df66bec68dbd80126aac87 (diff) | |
| download | go-f42418b25da382382a35730eff68fd27d049c581.tar.xz | |
cmd/trace: add user log event in the task-oriented trace view
Also append stack traces to task create/end slices.
R=go1.11
Change-Id: I2adb342e92b36d30bee2860393618eb4064450cf
Reviewed-on: https://go-review.googlesource.com/90220
Reviewed-by: Heschi Kreinick <heschi@google.com>
Diffstat (limited to 'src/cmd/trace/annotations.go')
| -rw-r--r-- | src/cmd/trace/annotations.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/cmd/trace/annotations.go b/src/cmd/trace/annotations.go index 3b853cc7f2..f2c4440a9a 100644 --- a/src/cmd/trace/annotations.go +++ b/src/cmd/trace/annotations.go @@ -850,6 +850,17 @@ func asMillisecond(d time.Duration) float64 { return float64(d.Nanoseconds()) / 1e6 } +func formatUserLog(ev *trace.Event) string { + k, v := ev.SArgs[0], ev.SArgs[1] + if k == "" { + return v + } + if v == "" { + return k + } + return fmt.Sprintf("%v=%v", k, v) +} + func describeEvent(ev *trace.Event) string { switch ev.Type { case trace.EvGoCreate: @@ -857,11 +868,7 @@ func describeEvent(ev *trace.Event) string { case trace.EvGoEnd, trace.EvGoStop: return "goroutine stopped" case trace.EvUserLog: - if k, v := ev.SArgs[0], ev.SArgs[1]; k == "" { - return v - } else { - return fmt.Sprintf("%v=%v", k, v) - } + return formatUserLog(ev) case trace.EvUserSpan: if ev.Args[1] == 0 { duration := "unknown" |