Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/trace: use new traceparser to parse the raw trace files

Browse source 
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>
This commit is contained in:
Peter Weinberger 2018-10-29 10:18:05 -04:00
parent f570b54cc0
commit 08816cb8d7
8 changed files with 194 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/cmd/trace/main.go
View file

@ -5,12 +5,12 @@
package main
import (
"bufio"
"bytes"
"cmd/internal/browser"
"flag"
"fmt"
"html/template"
"internal/trace"
trace "internal/traceparser"
"io"
"log"
"net"
@ -115,8 +115,22 @@ func main() {
dief("%v\n", err)
}
if *debugFlag {
trace.Print(res.Events)
if *debugFlag { // match go tool trace -d (except for Offset and Seq)
f := func(ev *trace.Event) {
desc := trace.EventDescriptions[ev.Type]
w := new(bytes.Buffer)
fmt.Fprintf(w, "%v %v p=%v g=%v", ev.Ts, desc.Name, ev.P, ev.G)
for i, a := range desc.Args {
fmt.Fprintf(w, " %v=%v", a, ev.Args[i])
}
for i, a := range desc.SArgs {
fmt.Fprintf(w, " %v=%v", a, ev.SArgs[i])
}
fmt.Println(w.String())
}
for i := 0; i < len(res.Events); i++ {
f(res.Events[i])
}
os.Exit(0)
}
reportMemoryUsage("after parsing trace")
@ -141,36 +155,23 @@ var ranges []Range
var loader struct {
once sync.Once
res trace.ParseResult
res *trace.Parsed
err error
}
// parseEvents is a compatibility wrapper that returns only
// the Events part of trace.ParseResult returned by parseTrace.
func parseEvents() ([]*trace.Event, error) {
res, err := parseTrace()
if err != nil {
return nil, err
}
return res.Events, err
}
func parseTrace() (trace.ParseResult, error) {
func parseTrace() (*trace.Parsed, error) {
loader.once.Do(func() {
tracef, err := os.Open(traceFile)
x, err := trace.New(traceFile)
if err != nil {
loader.err = fmt.Errorf("failed to open trace file: %v", err)
loader.err = err
return
}
defer tracef.Close()
// Parse and symbolize.
res, err := trace.Parse(bufio.NewReader(tracef), programBinary)
err = x.Parse(0, x.MaxTs, nil)
if err != nil {
loader.err = fmt.Errorf("failed to parse trace: %v", err)
loader.err = err
return
}
loader.res = res
loader.res = x
})
return loader.res, loader.err
}