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_test.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_test.go')
| -rw-r--r-- | src/cmd/trace/annotations_test.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/cmd/trace/annotations_test.go b/src/cmd/trace/annotations_test.go index a9068d53c1..8b9daabcdb 100644 --- a/src/cmd/trace/annotations_test.go +++ b/src/cmd/trace/annotations_test.go @@ -11,7 +11,7 @@ import ( "context" "flag" "fmt" - traceparser "internal/trace" + "internal/traceparser" "io/ioutil" "reflect" "runtime/debug" @@ -338,10 +338,8 @@ func traceProgram(t *testing.T, f func(), name string) error { trace.Stop() saveTrace(buf, name) - res, err := traceparser.Parse(buf, name+".faketrace") - if err == traceparser.ErrTimeOrder { - t.Skipf("skipping due to golang.org/issue/16755: %v", err) - } else if err != nil { + res, err := traceparser.ParseBuffer(buf) + if err != nil { return err } @@ -370,15 +368,15 @@ func childrenNames(task *taskDesc) (ret []string) { return ret } -func swapLoaderData(res traceparser.ParseResult, err error) { +func swapLoaderData(res *traceparser.Parsed, err error) { // swap loader's data. parseTrace() // fool loader.once. loader.res = res loader.err = err - analyzeGoroutines(nil) // fool gsInit once. - gs = traceparser.GoroutineStats(res.Events) + analyzeGoroutines(res) // fool gsInit once. + gs = res.GoroutineStats() } |