handle demangled C++ functions better

dshaw · Mar 1, 2012 · 65000d7 · 65000d7
1 parent d03cc99
commit 65000d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/flamegraph.pl b/flamegraph.pl
@@ -240,6 +240,9 @@ sub flow {
 		$info = "all samples ($samples samples, 100%)";
 	} else {
 		my $pct = sprintf "%.2f", ((100 * $samples) / $timemax);
+		$func =~ s/&/&amp;/g;
+		$func =~ s/</&lt;/g;
+		$func =~ s/>/&gt;/g;
 		$info = "$func ($samples samples, $pct%)";
 	}
 	$im->filledRectangle($x1, $y1, $x2, $y2, color("hot"), 'rx="2" ry="2" onmouseover="s(' . "'$info'" . ')" onmouseout="c()"');

diff --git a/stackcollapse.pl b/stackcollapse.pl
@@ -76,6 +76,8 @@ sub remember_stack {
 	my $frame = $_;
 	$frame =~ s/^\s*//;
 	$frame =~ s/\+.*$//;
+	# Remove arguments from C++ function names.
+	$frame =~ s/(..)[(<].*/$1/;
 	$frame = "-" if $frame eq "";
 	unshift @stack, $frame;
 }