diff --git a/misc/trace/README.md b/misc/trace/README.md index 8561c79bfd..2e8bb057d4 100644 --- a/misc/trace/README.md +++ b/misc/trace/README.md @@ -1,12 +1,16 @@ This directory contains helper file for trace viewer (`go tool trace`). `trace_viewer_lean.html` was generated by following -[instructions](https://github.com/google/trace-viewer/wiki/Embedding) -on revision `280626ef607decf36291e290d5f0322b173e8a7f` using: +[instructions](https://github.com/catapult-project/catapult/blob/master/tracing/docs/embedding-trace-viewer.md) +on revision `623a005a3ffa9de13c4b92bc72290e7bcd1ca591` +of [catapult](https://github.com/catapult-project/catapult) using: ``` -trace-viewer$ ./vulcanize_trace_viewer --config=lean -trace-viewer$ cp bin/trace_viewer_lean.html $GOROOT/misc/trace/ +catapult$ ./tracing/bin/vulcanize_trace_viewer --config=full +catapult$ cp tracing/bin/trace_viewer_full.html $GOROOT/misc/trace/trace_viewer_lean.html ``` +We are supposed to use --config=lean (produces smaller html), +but it is broken at the moment: +https://github.com/catapult-project/catapult/issues/2247 The license for trace-viewer is as follows: // Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/misc/trace/trace_viewer_lean.html b/misc/trace/trace_viewer_lean.html index 5d40bc5805..7939aae8a6 100644 --- a/misc/trace/trace_viewer_lean.html +++ b/misc/trace/trace_viewer_lean.html @@ -1,113 +1,9 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - + + + + + - - + + + + + - + + + + + - - +
+ + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Running process:
Running thread:
Start: + + +
Duration: + + +
Active slices:
Args: + + +
+ - - - - - - - - - - - +
+ - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + - - - - - - - - +
+

Navigation

+
+
w/s
+
Zoom in/out (+shift: faster)
+
- +
+
a/d
+
Pan left/right (+shift: faster)
+
+
+
→/shift-TAB
+
Select previous event
+
+
+
←/TAB
+
Select next event
+
+

Mouse Controls

+
+
click
+
Select event
+
+
+
alt-mousewheel
+
Zoom in/out
+
- - - - - - - - - - - - - - - - diff --git a/src/cmd/trace/trace.go b/src/cmd/trace/trace.go index fff732b856..7782a5efc8 100644 --- a/src/cmd/trace/trace.go +++ b/src/cmd/trace/trace.go @@ -44,19 +44,88 @@ func httpTrace(w http.ResponseWriter, r *http.Request) { } +// See https://github.com/catapult-project/catapult/blob/master/tracing/docs/embedding-trace-viewer.md +// This is almost verbatim copy of: +// https://github.com/catapult-project/catapult/blob/master/tracing/bin/index.html +// on revision 623a005a3ffa9de13c4b92bc72290e7bcd1ca591. var templTrace = ` - - - - - - + + + + + + `
Running process:
Running thread:
State:
Start: + + +
Duration: + + +