commit 7991019ca55b8e7d35de1fae9fe8a84b54dda75f
parent d9fcc272b6a08c3e3e5b7919040f0ab5f8952d65
Author: Brendan Gregg <brendan.d.gregg@gmail.com>
Date: Thu, 19 Oct 2023 09:01:41 +1100
Merge pull request #316 from matthew-olson-intel/minwidth
minwidth now accepts a percentage of time with %
Diffstat:
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
@@ -167,7 +167,8 @@ USAGE: ./flamegraph.pl [options] infile > outfile.svg
--subtitle TEXT # second level title (optional)
--width NUM # width of image (default 1200)
--height NUM # height of each frame (default 16)
- --minwidth NUM # omit smaller functions (default 0.1 pixels)
+ --minwidth NUM # omit smaller functions. In pixels or use "%" for
+ # percentage of time (default 0.1 pixels)
--fonttype FONT # font type (default "Verdana")
--fontsize NUM # font size (default 12)
--countname TEXT # count type label (default "samples")
diff --git a/flamegraph.pl b/flamegraph.pl
@@ -103,7 +103,7 @@ my $imagewidth = 1200; # max width, pixels
my $frameheight = 16; # max height is dynamic
my $fontsize = 12; # base text size
my $fontwidth = 0.59; # avg width relative to fontsize
-my $minwidth = 0.1; # min function width, pixels
+my $minwidth = 0.1; # min function width, pixels or percentage of time
my $nametype = "Function:"; # what are the names in the data?
my $countname = "samples"; # what are the counts in the data?
my $colors = "hot"; # color theme
@@ -134,7 +134,8 @@ USAGE: $0 [options] infile > outfile.svg\n
--subtitle TEXT # second level title (optional)
--width NUM # width of image (default 1200)
--height NUM # height of each frame (default 16)
- --minwidth NUM # omit smaller functions (default 0.1 pixels)
+ --minwidth NUM # omit smaller functions. In pixels or use "%" for
+ # percentage of time (default 0.1 pixels)
--fonttype FONT # font type (default "Verdana")
--fontsize NUM # font size (default 12)
--countname TEXT # count type label (default "samples")
@@ -165,7 +166,7 @@ GetOptions(
'encoding=s' => \$encoding,
'fontsize=f' => \$fontsize,
'fontwidth=f' => \$fontwidth,
- 'minwidth=f' => \$minwidth,
+ 'minwidth=s' => \$minwidth,
'title=s' => \$titletext,
'subtitle=s' => \$subtitletext,
'nametype=s' => \$nametype,
@@ -224,6 +225,16 @@ if ($notestext =~ /[<>]/) {
die "Notes string can't contain < or >"
}
+# Ensure minwidth is a valid floating-point number,
+# print usage string if not
+my $minwidth_f;
+if ($minwidth =~ /^([0-9.]+)%?$/) {
+ $minwidth_f = $1;
+} else {
+ warn "Value '$minwidth' is invalid for minwidth, expected a float.\n";
+ usage();
+}
+
# background colors:
# - yellow gradient: default (hot, java, js, perl)
# - green gradient: mem
@@ -703,7 +714,14 @@ if ($timemax and $timemax < $time) {
$timemax ||= $time;
my $widthpertime = ($imagewidth - 2 * $xpad) / $timemax;
-my $minwidth_time = $minwidth / $widthpertime;
+
+# Treat as a percentage of time if the string ends in a "%".
+my $minwidth_time;
+if ($minwidth =~ /%$/) {
+ $minwidth_time = $timemax * $minwidth_f / 100;
+} else {
+ $minwidth_time = $minwidth_f / $widthpertime;
+}
# prune blocks that are too narrow and determine max depth
while (my ($id, $node) = each %Node) {