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

Add support for differential flame graphs #60

Merged
merged 12 commits into from
Feb 25, 2019
Merged

Add support for differential flame graphs #60

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09ca820
Add support for differential flame graphs
jasonrhansen Feb 25, 2019
ed67aaf
Fix for clippy
jasonrhansen Feb 25, 2019
3bde4f4
Add comments to color_scale
jasonrhansen Feb 25, 2019
688ad4b
Add comment that references to #43
jasonrhansen Feb 25, 2019
c6ceda2
Simplify parse_nsamples
jasonrhansen Feb 25, 2019
851c11c
Make samples parsing more clear
jasonrhansen Feb 25, 2019
001c370
Hoist out deannotate
jasonrhansen Feb 25, 2019
7b4771d
Simplify delta code
jasonrhansen Feb 25, 2019
0c67f5d
Have clippy allow cyclomatic_complexity for now
jasonrhansen Feb 25, 2019
162a919
Add comment linking to Perl version of strange += for delta
jasonrhansen Feb 25, 2019
8038269
Reorder fields in default
jasonrhansen Feb 25, 2019
b6092f7
Minor cleanup
jasonrhansen Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/flamegraph/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ where
let nsamples = if let Some(s2) = parse_nsamples(&mut line) {
jasonrhansen marked this conversation as resolved.
Show resolved Hide resolved
// See if there's also a differential column present
let nsamples1 = parse_nsamples(&mut line);
delta = nsamples1.and_then(|s1| Some(s2 as isize - s1 as isize));
if let Some(delta) = delta {
delta_max = std::cmp::max(delta.abs() as usize, delta_max);
if let Some(s1) = nsamples1 {
jasonrhansen marked this conversation as resolved.
Show resolved Hide resolved
delta = Some(s2 as isize - s1 as isize);
delta_max = std::cmp::max(delta.unwrap().abs() as usize, delta_max);
}
s2
} else {
Expand Down