Merge remote-tracking branch 'upstream/master'

internal/driver/commands.go

@@ -68,6 +68,14 @@ func AddCommand(cmd string, format int, post PostProcessor, desc, usage string)
 	pprofCommands[cmd] = &command{format, post, false, desc, usage}
 }
 
+// SetVariableDefault sets the default value for a pprof
+// variable. This enables extensions to set their own defaults.
+func SetVariableDefault(variable, value string) {
+	if v := pprofVariables[variable]; v != nil {
+		v.value = value
+	}
+}
+
 // PostProcessor is a function that applies post-processing to the report output
 type PostProcessor func(input []byte, output io.Writer, ui plugin.UI) error
 

internal/report/source.go

@@ -339,7 +339,8 @@ func printPageClosing(w io.Writer) {
 // file and annotates it with the samples in fns. Returns the sources
 // as nodes, using the info.name field to hold the source code.
 func getSourceFromFile(file, sourcePath string, fns graph.Nodes, start, end int) (graph.Nodes, string, error) {
-	f, file, err := openSourceFile(file, sourcePath)
+	file = trimPath(file)
+	f, err := openSourceFile(file, sourcePath)
 	if err != nil {
 		return nil, file, err
 	}
@@ -434,12 +435,10 @@ func getMissingFunctionSource(filename string, asm map[int]graph.Nodes, start, e
 // profile. File names in a profile after often relative paths, so
 // search them in each of the paths in searchPath (or CWD by default),
 // and their parents.
-func openSourceFile(path, searchPath string) (*os.File, string, error) {
-	path = trimPath(path)
-
+func openSourceFile(path, searchPath string) (*os.File, error) {
 	if filepath.IsAbs(path) {
 		f, err := os.Open(path)
-		return f, path, err
+		return f, err
 	}
 
 	// Scan each component of the path
@@ -448,7 +447,7 @@ func openSourceFile(path, searchPath string) (*os.File, string, error) {
 		for {
 			filename := filepath.Join(dir, path)
 			if f, err := os.Open(filename); err == nil {
-				return f, filename, nil
+				return f, nil
 			}
 			parent := filepath.Dir(dir)
 			if parent == dir {
@@ -458,7 +457,7 @@ func openSourceFile(path, searchPath string) (*os.File, string, error) {
 		}
 	}
 
-	return nil, "", fmt.Errorf("Could not find file %s on path %s", path, searchPath)
+	return nil, fmt.Errorf("Could not find file %s on path %s", path, searchPath)
 }
 
 // trimPath cleans up a path by removing prefixes that are commonly