Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Colorize weblist output #271

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Colorize weblist output #271

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b64b875
Colorize weblist output
Maaarcocr Nov 29, 2017
3c1cc88
updating testdata
Maaarcocr Dec 1, 2017
f20b0fa
getting rid of percentile_0
Maaarcocr Dec 1, 2017
54536e0
Actually calculating percentiles. Missing tests.
Maaarcocr Dec 1, 2017
2393a99
added tests
Maaarcocr Dec 1, 2017
7f5dfe6
formatted
Maaarcocr Dec 2, 2017
f8123b3
review suggestions implemented
Maaarcocr Dec 18, 2017
3e3a1c0
Merge branch 'master' into master
nolanmar511 Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 36 additions & 21 deletions internal/driver/testdata/pprof.cpu.flat.addresses.weblist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,21 @@ background-color: #eeeeee;
color: #008800;
display: none;
}
.percentile_80 {
background-color: #fe5252
}
.percentile_60 {
background-color: #e09764
}
.percentile_40 {
background-color: #d1b96d
}
.percentile_20 {
background-color: #c3dc76
}
.percentile_10 {
background-color: #b3ff80
}
</style>
<script type="text/javascript">
function pprof_toggle_asm(e) {
Expand All @@ -64,41 +79,41 @@ Type: cpu<br>
Duration: 10s, Total samples = 1.12s (11.20%)<br>Total: 1.12s</div><h2>line1000</h2><p class="filename">testdata/file1000.src</p>
<pre onClick="pprof_toggle_asm(event)">
Total: 1.10s 1.10s (flat, cum) 98.21%
<span class=line> 1</span> <span class=deadsrc> 1.10s 1.10s line1 </span><span class=asm> 1.10s 1.10s 1000: instruction one <span class=unimportant>file1000.src:1</span>
<span class=line> 1</span> <span class="deadsrc percentile_80"> 1.10s 1.10s line1 </span><span class=asm> 1.10s 1.10s 1000: instruction one <span class=unimportant>file1000.src:1</span>
. . 1001: instruction two <span class=unimportant>file1000.src:1</span>
⋮
. . 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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing space shouldn't be there.

<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> 6</span> <span class=deadsrc> 10ms 1.01s line6 </span><span class=asm> 10ms 1.01s 3000: instruction one <span class=unimportant>file3000.src:6</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 "> . 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
28 changes: 24 additions & 4 deletions internal/report/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func PrintWebList(w io.Writer, rpt *Report, obj plugin.ObjTool, maxFiles int) er

printFunctionHeader(w, ff.functionName, path, n.Flat, n.Cum, rpt)
for _, fn := range fnodes {
printFunctionSourceLine(w, fn, asm[fn.Info.Lineno], reader, rpt)
printFunctionSourceLine(w, fn, asm[fn.Info.Lineno], reader, n.Cum, rpt)
}
printFunctionClosing(w)
}
Expand Down Expand Up @@ -347,20 +347,40 @@ 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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not percentile.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will change this. Misunderstood its meaning.

Copy link
Author

@Maaarcocr Maaarcocr Dec 1, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aalexand I have now implemented percentile. I'm not sure if my code (in terms of style and correctness) is fine, thus I have pushed a first version without tests, to get it reviewed. I will add tests soon.

I wonder if the percentiles functions should go into a different file or if they belong where they are.

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, rpt *Report) {
func printFunctionSourceLine(w io.Writer, fn *graph.Node, assembly []assemblyInstruction, reader *sourceReader, cumSum int64, rpt *Report) {
percentile := calculatePercentile(fn.Cum, cumSum)
if len(assembly) == 0 {
fmt.Fprintf(w,
"<span class=line> %6d</span> <span class=nop> %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,
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> %10s %10s %8s %s </span>",
"<span class=line> %6d</span> <span class=\"deadsrc %s\"> %10s %10s %8s %s </span>",
fn.Info.Lineno,
percentile,
valueOrDot(fn.Flat, rpt), valueOrDot(fn.Cum, rpt),
"", template.HTMLEscapeString(fn.Info.Name))
srcIndent := indentation(fn.Info.Name)
Expand Down
15 changes: 15 additions & 0 deletions internal/report/source_html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,21 @@ background-color: #eeeeee;
color: #008800;
display: none;
}
.percentile_80 {
background-color: #fe5252
}
.percentile_60 {
background-color: #e09764
}
.percentile_40 {
background-color: #d1b96d
}
.percentile_20 {
background-color: #c3dc76
}
.percentile_10 {
background-color: #b3ff80
}
</style>`

const weblistPageScript = `<script type="text/javascript">
Expand Down