From 2c9d773f7411de211389b9e1da441fae68f826d8 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Apr 2016 16:31:42 +0200 Subject: [PATCH] misc/trace: update trace viewer html The old trace-viewer is broken since Chrome 49: https://bugs.chromium.org/p/chromium/issues/detail?id=569417 It was fixed in: https://github.com/catapult-project/catapult/commit/506457cbd726324f327b80ae11f46c1dfeb8710d This change updates trace-viewer to the latest version (now it is called catapult). This version has a bug in the lean config that we use, though: https://github.com/catapult-project/catapult/issues/2247 So use full config for now (it works, but leads to larger html). When the bug is fixed we need to switch back to lean config (issue #15302). Change-Id: Ifb8d782ced66e3292d81c5604039fe18eaf267c5 Reviewed-on: https://go-review.googlesource.com/22013 Reviewed-by: Brad Fitzpatrick --- misc/trace/README.md | 12 +- misc/trace/trace_viewer_lean.html | 8773 ++++++++++++++++++++--------- src/cmd/trace/trace.go | 91 +- 3 files changed, 6332 insertions(+), 2544 deletions(-) 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 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - + + + + + + - table tr > td { - padding: 2px 4px 2px 4px; - vertical-align: text-top; - width: 150px; + + + + + + + + + + + + + + + + + + + - - - + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - +
+ - - - - - - - - + + + + - - - - - - + +
+ + +
+ + + + + - - - - - - - - - - - - - - - - - - - + #icon { + display: flex; + flex: 0 0 auto; + flex: 0 0 auto; + } + dialog { + position: absolute; + padding: 0; + border: 0; + margin: 0; + } + dialog::backdrop { + background: rgba(0,0,0,.05); + } - - - - - - - - +
+ - - - +
+ +
+ - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + +