Commit 2de897f4 authored by Hana (Hyang-Ah) Kim's avatar Hana (Hyang-Ah) Kim Committed by Hyang-Ah Hana Kim

cmd: sync github.com/google/pprof@v0.0.0-20191105193234-27840fff0d09

https://github.com/google/pprof/compare/54271f7e092f...27840fff0d09

Change-Id: I7ded9be6deaaf8d11bd8d228bca8d7eb3ada8774
Reviewed-on: https://go-review.googlesource.com/c/go/+/205780
Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 00e14afa
...@@ -3,7 +3,7 @@ module cmd ...@@ -3,7 +3,7 @@ module cmd
go 1.14 go 1.14
require ( require (
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f github.com/google/pprof v0.0.0-20191105193234-27840fff0d09
github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 // indirect github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 // indirect
golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
......
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ= github.com/google/pprof v0.0.0-20191105193234-27840fff0d09 h1:k2LrtvxLSqJVi/o6O71W+AdZgHzU/mNX7kOXzWUORn0=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191105193234-27840fff0d09/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 h1:pKqc8lAAA6rcwpvsephnRuZp4VHbfszZRClvqAE6Sq8= github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 h1:pKqc8lAAA6rcwpvsephnRuZp4VHbfszZRClvqAE6Sq8=
github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 h1:A71BZbKSu+DtCNry/x5JKn20C+64DirDHmePEA8k0FY= golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 h1:A71BZbKSu+DtCNry/x5JKn20C+64DirDHmePEA8k0FY=
......
...@@ -14,10 +14,12 @@ ...@@ -14,10 +14,12 @@
package driver package driver
import "html/template" import (
"html/template"
import "github.com/google/pprof/third_party/d3" "github.com/google/pprof/third_party/d3"
import "github.com/google/pprof/third_party/d3flamegraph" "github.com/google/pprof/third_party/d3flamegraph"
)
// addTemplates adds a set of template definitions to templates. // addTemplates adds a set of template definitions to templates.
func addTemplates(templates *template.Template) { func addTemplates(templates *template.Template) {
...@@ -91,7 +93,7 @@ a { ...@@ -91,7 +93,7 @@ a {
text-align: left; text-align: left;
} }
.header input { .header input {
background: white url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' style='pointer-events:none;display:block;width:100%25;height:100%25;fill:#757575'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61.0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3C/svg%3E") no-repeat 4px center/20px 20px; background: white url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' style='pointer-events:none;display:block;width:100%25;height:100%25;fill:%23757575'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61.0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3C/svg%3E") no-repeat 4px center/20px 20px;
border: 1px solid #d1d2d3; border: 1px solid #d1d2d3;
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;
padding: 0.25em; padding: 0.25em;
...@@ -610,8 +612,9 @@ function viewer(baseUrl, nodes) { ...@@ -610,8 +612,9 @@ function viewer(baseUrl, nodes) {
function handleKey(e) { function handleKey(e) {
if (e.keyCode != 13) return; if (e.keyCode != 13) return;
window.location.href = setHrefParams(window.location, function (params) {
updateUrl(new URL(window.location.href), 'f'); params.set('f', search.value);
});
e.preventDefault(); e.preventDefault();
} }
...@@ -650,11 +653,13 @@ function viewer(baseUrl, nodes) { ...@@ -650,11 +653,13 @@ function viewer(baseUrl, nodes) {
}) })
// add matching items that are not currently selected. // add matching items that are not currently selected.
if (nodes) {
for (let n = 0; n < nodes.length; n++) { for (let n = 0; n < nodes.length; n++) {
if (!selected.has(n) && match(nodes[n])) { if (!selected.has(n) && match(nodes[n])) {
select(n, document.getElementById('node' + n)); select(n, document.getElementById('node' + n));
} }
} }
}
updateButtons(); updateButtons();
} }
...@@ -1089,6 +1094,7 @@ function viewer(baseUrl, nodes) { ...@@ -1089,6 +1094,7 @@ function viewer(baseUrl, nodes) {
.transitionDuration(750) .transitionDuration(750)
.transitionEase(d3.easeCubic) .transitionEase(d3.easeCubic)
.inverted(true) .inverted(true)
.sort(true)
.title('') .title('')
.tooltip(false) .tooltip(false)
.details(document.getElementById('flamegraphdetails')); .details(document.getElementById('flamegraphdetails'));
......
...@@ -334,7 +334,7 @@ func dotToSvg(dot []byte) ([]byte, error) { ...@@ -334,7 +334,7 @@ func dotToSvg(dot []byte) ([]byte, error) {
return nil, err return nil, err
} }
// Fix dot bug related to unquoted amperands. // Fix dot bug related to unquoted ampersands.
svg := bytes.Replace(out.Bytes(), []byte("&;"), []byte("&amp;;"), -1) svg := bytes.Replace(out.Bytes(), []byte("&;"), []byte("&amp;;"), -1)
// Cleanup for embedding by dropping stuff before the <svg> start. // Cleanup for embedding by dropping stuff before the <svg> start.
......
...@@ -28,9 +28,19 @@ import ( ...@@ -28,9 +28,19 @@ import (
) )
var ( var (
// Removes package name and method arugments for Java method names.
// See tests for examples.
javaRegExp = regexp.MustCompile(`^(?:[a-z]\w*\.)*([A-Z][\w\$]*\.(?:<init>|[a-z][\w\$]*(?:\$\d+)?))(?:(?:\()|$)`) javaRegExp = regexp.MustCompile(`^(?:[a-z]\w*\.)*([A-Z][\w\$]*\.(?:<init>|[a-z][\w\$]*(?:\$\d+)?))(?:(?:\()|$)`)
// Removes package name and method arugments for Go function names.
// See tests for examples.
goRegExp = regexp.MustCompile(`^(?:[\w\-\.]+\/)+(.+)`) goRegExp = regexp.MustCompile(`^(?:[\w\-\.]+\/)+(.+)`)
cppRegExp = regexp.MustCompile(`^(?:(?:\(anonymous namespace\)::)(\w+$))|(?:(?:\(anonymous namespace\)::)?(?:[_a-zA-Z]\w*\::|)*(_*[A-Z]\w*::~?[_a-zA-Z]\w*)$)`) // Strips C++ namespace prefix from a C++ function / method name.
// NOTE: Make sure to keep the template parameters in the name. Normally,
// template parameters are stripped from the C++ names but when
// -symbolize=demangle=templates flag is used, they will not be.
// See tests for examples.
cppRegExp = regexp.MustCompile(`^(?:[_a-zA-Z]\w*::)+(_*[A-Z]\w*::~?[_a-zA-Z]\w*(?:<.*>)?)`)
cppAnonymousPrefixRegExp = regexp.MustCompile(`^\(anonymous namespace\)::`)
) )
// Graph summarizes a performance profile into a format that is // Graph summarizes a performance profile into a format that is
...@@ -191,7 +201,7 @@ type NodeSet map[NodeInfo]bool ...@@ -191,7 +201,7 @@ type NodeSet map[NodeInfo]bool
// works as a unique identifier; however, in a tree multiple nodes may share // works as a unique identifier; however, in a tree multiple nodes may share
// identical NodeInfos. A *Node does uniquely identify a node so we can use that // identical NodeInfos. A *Node does uniquely identify a node so we can use that
// instead. Though a *Node also uniquely identifies a node in a graph, // instead. Though a *Node also uniquely identifies a node in a graph,
// currently, during trimming, graphs are rebult from scratch using only the // currently, during trimming, graphs are rebuilt from scratch using only the
// NodeSet, so there would not be the required context of the initial graph to // NodeSet, so there would not be the required context of the initial graph to
// allow for the use of *Node. // allow for the use of *Node.
type NodePtrSet map[*Node]bool type NodePtrSet map[*Node]bool
...@@ -429,6 +439,7 @@ func newTree(prof *profile.Profile, o *Options) (g *Graph) { ...@@ -429,6 +439,7 @@ func newTree(prof *profile.Profile, o *Options) (g *Graph) {
// ShortenFunctionName returns a shortened version of a function's name. // ShortenFunctionName returns a shortened version of a function's name.
func ShortenFunctionName(f string) string { func ShortenFunctionName(f string) string {
f = cppAnonymousPrefixRegExp.ReplaceAllString(f, "")
for _, re := range []*regexp.Regexp{goRegExp, javaRegExp, cppRegExp} { for _, re := range []*regexp.Regexp{goRegExp, javaRegExp, cppRegExp} {
if matches := re.FindStringSubmatch(f); len(matches) >= 2 { if matches := re.FindStringSubmatch(f); len(matches) >= 2 {
return strings.Join(matches[1:], "") return strings.Join(matches[1:], "")
......
...@@ -34,7 +34,7 @@ type Options struct { ...@@ -34,7 +34,7 @@ type Options struct {
UI UI UI UI
// HTTPServer is a function that should block serving http requests, // HTTPServer is a function that should block serving http requests,
// including the handlers specfied in args. If non-nil, pprof will // including the handlers specified in args. If non-nil, pprof will
// invoke this function if necessary to provide a web interface. // invoke this function if necessary to provide a web interface.
// //
// If HTTPServer is nil, pprof will use its own internal HTTP server. // If HTTPServer is nil, pprof will use its own internal HTTP server.
......
# github.com/google/pprof v0.0.0-20190515194954-54271f7e092f # github.com/google/pprof v0.0.0-20191105193234-27840fff0d09
## explicit ## explicit
github.com/google/pprof/driver github.com/google/pprof/driver
github.com/google/pprof/internal/binutils github.com/google/pprof/internal/binutils
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment