diff options
| author | Peter Weinberger <pjw@google.com> | 2018-10-29 10:18:05 -0400 |
|---|---|---|
| committer | Peter Weinberger <pjw@google.com> | 2018-10-30 16:43:38 +0000 |
| commit | 08816cb8d7ed16b9c804587ff02c1ad1c3af6cd5 (patch) | |
| tree | 1951b6cd86b05ed0faa4dfc99e17592997b661f9 /src/cmd/trace/annotations.go | |
| parent | f570b54cc02ffeb82e35e72fc818916e8b896c67 (diff) | |
| download | go-08816cb8d7ed16b9c804587ff02c1ad1c3af6cd5.tar.xz | |
cmd/trace: use new traceparser to parse the raw trace files
Change-Id: I8b224ae48a2f8acd5a64c9ff283e97821479a9a8
Reviewed-on: https://go-review.googlesource.com/c/145457
Run-TryBot: Peter Weinberger <pjw@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Diffstat (limited to 'src/cmd/trace/annotations.go')
| -rw-r--r-- | src/cmd/trace/annotations.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cmd/trace/annotations.go b/src/cmd/trace/annotations.go index 307da58bd5..9905456b46 100644 --- a/src/cmd/trace/annotations.go +++ b/src/cmd/trace/annotations.go @@ -8,7 +8,6 @@ import ( "bytes" "fmt" "html/template" - "internal/trace" "log" "math" "net/http" @@ -17,6 +16,8 @@ import ( "strconv" "strings" "time" + + trace "internal/traceparser" ) func init() { @@ -308,7 +309,7 @@ func analyzeAnnotations() (annotationAnalysisResult, error) { } } // combine region info. - analyzeGoroutines(events) + analyzeGoroutines(res) for goid, stats := range gs { // gs is a global var defined in goroutines.go as a result // of analyzeGoroutines. TODO(hyangah): fix this not to depend @@ -321,7 +322,7 @@ func analyzeAnnotations() (annotationAnalysisResult, error) { } var frame trace.Frame if s.Start != nil { - frame = *s.Start.Stk[0] + frame = *res.Stacks[s.Start.StkID][0] } id := regionTypeID{Frame: frame, Type: s.Name} regions[id] = append(regions[id], regionDesc{UserRegionDesc: s, G: goid}) |