Skip to content

Commit

Permalink
Actually calculating percentiles. Missing tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maaarcocr
Maaarcocr committed Dec 1, 2017
1 parent f20b0fa commit 54536e0
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 43 deletions.
38 changes: 19 additions & 19 deletions internal/driver/testdata/pprof.cpu.flat.addresses.weblist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,36 +84,36 @@ Duration: 10s, Total samples = 1.12s (11.20%)<br>Total: 1.12s</div><h2>line1000<
⋮
. . 1003: instruction four <span class=unimportant>file1000.src:1</span>
</span>
<span class=line> 2</span> <span class="deadsrc "> . . line2 </span><span class=asm> . . 1002: instruction three <span class=unimportant>file1000.src:2</span>
<span class=line> 2</span> <span class="deadsrc"> . . line2 </span><span class=asm> . . 1002: instruction three <span class=unimportant>file1000.src:2</span>
</span>
<span class=line> 3</span> <span class="nop "> . . line3 </span>
<span class=line> 4</span> <span class="nop "> . . line4 </span>
<span class=line> 5</span> <span class="nop "> . . line5 </span>
<span class=line> 6</span> <span class="nop "> . . line6 </span>
<span class=line> 7</span> <span class="nop "> . . line7 </span>
<span class=line> 3</span> <span class="nop"> . . line3 </span>
<span class=line> 4</span> <span class="nop"> . . line4 </span>
<span class=line> 5</span> <span class="nop"> . . line5 </span>
<span class=line> 6</span> <span class="nop"> . . line6 </span>
<span class=line> 7</span> <span class="nop"> . . line7 </span>
</pre>
<h2>line3000</h2><p class="filename">testdata/file3000.src</p>
<pre onClick="pprof_toggle_asm(event)">
Total: 10ms 1.12s (flat, cum) 100%
<span class=line> 1</span> <span class="nop "> . . line1 </span>
<span class=line> 2</span> <span class="nop "> . . line2 </span>
<span class=line> 3</span> <span class="nop "> . . line3 </span>
<span class=line> 4</span> <span class="nop "> . . line4 </span>
<span class=line> 5</span> <span class="nop "> . . line5 </span>
<span class=line> 1</span> <span class="nop"> . . line1 </span>
<span class=line> 2</span> <span class="nop"> . . line2 </span>
<span class=line> 3</span> <span class="nop"> . . line3 </span>
<span class=line> 4</span> <span class="nop"> . . line4 </span>
<span class=line> 5</span> <span class="nop"> . . line5 </span>
<span class=line> 6</span> <span class="deadsrc percentile_80"> 10ms 1.01s line6 </span><span class=asm> 10ms 1.01s 3000: instruction one <span class=unimportant>file3000.src:6</span>
</span>
<span class=line> 7</span> <span class="nop "> . . line7 </span>
<span class=line> 8</span> <span class="nop "> . . line8 </span>
<span class=line> 9</span> <span class="deadsrc "> . 110ms line9 </span><span class=asm> . 100ms 3001: instruction two <span class=unimportant>file3000.src:9</span>
<span class=line> 7</span> <span class="nop"> . . line7 </span>
<span class=line> 8</span> <span class="nop"> . . line8 </span>
<span class=line> 9</span> <span class="deadsrc percentile_60"> . 110ms line9 </span><span class=asm> . 100ms 3001: instruction two <span class=unimportant>file3000.src:9</span>
. 10ms 3002: instruction three <span class=unimportant>file3000.src:9</span>
. . 3003: instruction four <span class=unimportant></span>
. . 3004: instruction five <span class=unimportant></span>
</span>
<span class=line> 10</span> <span class="nop "> . . line0 </span>
<span class=line> 11</span> <span class="nop "> . . line1 </span>
<span class=line> 12</span> <span class="nop "> . . line2 </span>
<span class=line> 13</span> <span class="nop "> . . line3 </span>
<span class=line> 14</span> <span class="nop "> . . line4 </span>
<span class=line> 10</span> <span class="nop"> . . line0 </span>
<span class=line> 11</span> <span class="nop"> . . line1 </span>
<span class=line> 12</span> <span class="nop"> . . line2 </span>
<span class=line> 13</span> <span class="nop"> . . line3 </span>
<span class=line> 14</span> <span class="nop"> . . line4 </span>
</pre>

</body>
Expand Down
90 changes: 66 additions & 24 deletions internal/report/source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"io"
"os"
"path/filepath"
"sort"
"strconv"
"strings"

Expand Down Expand Up @@ -214,14 +215,73 @@ func PrintWebList(w io.Writer, rpt *Report, obj plugin.ObjTool, maxFiles int) er
}

printFunctionHeader(w, ff.functionName, path, n.Flat, n.Cum, rpt)
percentiles := calculatePercentiles(fnodes)
for _, fn := range fnodes {
printFunctionSourceLine(w, fn, asm[fn.Info.Lineno], reader, n.Cum, rpt)
printFunctionSourceLine(w, fn, asm[fn.Info.Lineno], reader, getPercentileString(float64(fn.Cum), percentiles), rpt)
}
printFunctionClosing(w)
}
return nil
}

func getPercentileString(cumSum float64, percentiles map[float64]float64) string {
if cumSum == 0 {
return ""
}
switch {
case cumSum >= percentiles[80]:
return " percentile_80"
case cumSum >= percentiles[60]:
return " percentile_60"
case cumSum >= percentiles[40]:
return " percentile_40"
case cumSum >= percentiles[20]:
return " percentile_20"
case cumSum >= percentiles[10]:
return " percentile_10"
}
return ""
}

// calculate percentile expects cumSums to be sorted and
// to contain unique elements. It also expects the percentile to be between 0 and 99.
func calculatePercentile(percentile float64, cumSums []float64) float64 {
rank := percentile / 100 * float64(len(cumSums))
return cumSums[int64(rank)]
}

func getSetOfCumValues(fnodes graph.Nodes) []float64 {
mapOfCumValues := make(map[int64]bool)

for _, fn := range fnodes {
if _, ok := mapOfCumValues[fn.Cum]; !ok {
mapOfCumValues[fn.Cum] = true
}
}

setOfCumValues := make([]float64, 0, len(mapOfCumValues))
for key, _ := range mapOfCumValues {
setOfCumValues = append(setOfCumValues, float64(key))
}
return setOfCumValues
}

// calculatePercentiles returns nil when the fnodes is 0
// because its result will never be used in such a case.
func calculatePercentiles(fnodes graph.Nodes) map[float64]float64 {
if len(fnodes) == 0 {
return nil
}
setOfCumValues := getSetOfCumValues(fnodes)
percentiles := map[float64]float64{80: 0, 60: 0, 40: 0, 20: 0, 10: 0}
sort.Float64s(setOfCumValues)
for key, _ := range percentiles {
percentiles[key] = calculatePercentile(key, setOfCumValues)
}

return percentiles
}

// sourceCoordinates returns the lowest and highest line numbers from
// a set of assembly statements.
func sourceCoordinates(asm map[int][]assemblyInstruction) (start, end int) {
Expand Down Expand Up @@ -347,40 +407,22 @@ func printFunctionHeader(w io.Writer, name, path string, flatSum, cumSum int64,
measurement.Percentage(cumSum, rpt.total))
}

func calculatePercentile(partial, sum int64) string {
percentile := partial * 100 / sum
switch {
case percentile > 80:
return "percentile_80"
case percentile > 60:
return "percentile_60"
case percentile > 40:
return "percentile_40"
case percentile > 20:
return "percentile_20"
case percentile > 10:
return "percentile_10"
}
return ""
}

// printFunctionSourceLine prints a source line and the corresponding assembly.
func printFunctionSourceLine(w io.Writer, fn *graph.Node, assembly []assemblyInstruction, reader *sourceReader, cumSum int64, rpt *Report) {
percentile := calculatePercentile(fn.Cum, cumSum)
func printFunctionSourceLine(w io.Writer, fn *graph.Node, assembly []assemblyInstruction, reader *sourceReader, percentileString string, rpt *Report) {
if len(assembly) == 0 {
fmt.Fprintf(w,
"<span class=line> %6d</span> <span class=\"nop %s\"> %10s %10s %8s %s </span>\n",
"<span class=line> %6d</span> <span class=\"nop%s\"> %10s %10s %8s %s </span>\n",
fn.Info.Lineno,
percentile,
percentileString,
valueOrDot(fn.Flat, rpt), valueOrDot(fn.Cum, rpt),
"", template.HTMLEscapeString(fn.Info.Name))
return
}

fmt.Fprintf(w,
"<span class=line> %6d</span> <span class=\"deadsrc %s\"> %10s %10s %8s %s </span>",
"<span class=line> %6d</span> <span class=\"deadsrc%s\"> %10s %10s %8s %s </span>",
fn.Info.Lineno,
percentile,
percentileString,
valueOrDot(fn.Flat, rpt), valueOrDot(fn.Cum, rpt),
"", template.HTMLEscapeString(fn.Info.Name))
srcIndent := indentation(fn.Info.Name)
Expand Down

0 comments on commit 54536e0

Please sign in to comment.