[PATCH 0/2] FreeBSD rproxy fixes

[PATCH 0/2] FreeBSD rproxy fixes

[Eric Wong]

OK, GNU binutils 2.39 addr2line works on FreeBSD.  It's slow
and doesn't work well with MWRAP=bt:10, so mwrap itself gets
disabled for addr2line.

Eric Wong (2):
  rproxy: quiet down addr2line output on FreeBSD
  rproxy: disable MWRAP+LD_PRELOAD for addr2line

 lib/Devel/Mwrap/Rproxy.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

[PATCH 1/2] rproxy: quiet down addr2line output on FreeBSD

[Eric Wong]

No point in showing "?? at ??:0" to prefix everything.
---
 lib/Devel/Mwrap/Rproxy.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Devel/Mwrap/Rproxy.pm b/lib/Devel/Mwrap/Rproxy.pm
index 8dc78a2..c831a36 100644
--- a/lib/Devel/Mwrap/Rproxy.pm
+++ b/lib/Devel/Mwrap/Rproxy.pm
@@ -101,6 +101,7 @@ sub a2l {
 
 		$a2l ? do {
 			chomp(my $line = $a2l->lookup($addr));
+			$line =~ s/\Q?? at ??:0\E//; # FreeBSD
 			$line = Plack::Util::encode_html($line);
 			$line =~ /\?\?/ ? "$line $exe($addr)" :
 				($line =~ /\S/ ? $line : "$exe($addr)");

[PATCH 2/2] rproxy: disable MWRAP+LD_PRELOAD for addr2line

[Eric Wong]

GNU addr2line seems impossibly slow with MWRAP=bt:10 on FreeBSD.
In any case, it's impossible for a single-process rproxy to
inspect it's own addr2line processes; so just disable it.
---
 lib/Devel/Mwrap/Rproxy.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/Devel/Mwrap/Rproxy.pm b/lib/Devel/Mwrap/Rproxy.pm
index c831a36..e2b7097 100644
--- a/lib/Devel/Mwrap/Rproxy.pm
+++ b/lib/Devel/Mwrap/Rproxy.pm
@@ -139,6 +139,13 @@ sub call { # PSGI entry point
 			undef %cache;
 			$cache_exp = $now + $cache_time;
 		}
+
+		# GNU addr2line is slow with high bt:, and FreeBSD addr2line
+		# seems less capable.  And we can't see addr2line in this
+		# anyways since we kill them at the end of this scope.
+		# So just disable MWRAP, here:
+		delete local $ENV{MWRAP};
+		delete local $ENV{LD_PRELOAD};
 		eval {
 			local %addr2line;
 			# extract executable|library(address)