From bf543df20ccd9e2c422751908cabf073bc7f5d4b Mon Sep 17 00:00:00 2001
From: Harald Weppner <harald.weppner@tidalscale.com>
Date: Mon, 17 Mar 2014 23:53:00 -0700
Subject: [PATCH 1/3] Enable profiling / leak detection in FreeBSD

* Assumes procfs is mounted at /proc, cf.
  <http://www.freebsd.org/doc/en/articles/linux-users/procfs.html>
---
 bin/pprof  | 22 ++++++++++++++++++++--
 src/prof.c |  8 +++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/bin/pprof b/bin/pprof
index 727eb437..08c9ea31 100755
--- a/bin/pprof
+++ b/bin/pprof
@@ -4197,8 +4197,12 @@ sub FindLibrary {
 # For libc libraries, the copy in /usr/lib/debug contains debugging symbols
 sub DebuggingLibrary {
   my $file = shift;
-  if ($file =~ m|^/| && -f "/usr/lib/debug$file") {
-    return "/usr/lib/debug$file";
+  if ($file =~ m|^/|) {
+      if (-f "/usr/lib/debug$file") {
+        return "/usr/lib/debug$file";
+      } elsif (-f "/usr/lib/debug$file.debug") {
+        return "/usr/lib/debug$file.debug";
+      }
   }
   return undef;
 }
@@ -4360,6 +4364,19 @@ sub ParseLibraries {
       $finish = HexExtend($2);
       $offset = $zero_offset;
       $lib = $3;
+    }
+    # FreeBSD 10.0 virtual memory map /proc/curproc/map as defined in
+    # function procfs_doprocmap (sys/fs/procfs/procfs_map.c)
+    #
+    # Example:
+    # 0x800600000 0x80061a000 26 0 0xfffff800035a0000 r-x 75 33 0x1004 COW NC vnode /libexec/ld-elf.s
+    # o.1 NCH -1
+    elsif ($l =~ /^(0x$h)\s(0x$h)\s\d+\s\d+\s0x$h\sr-x\s\d+\s\d+\s0x\d+\s(COW|NCO)\s(NC|NNC)\svnode\s(\S+\.so(\.\d+)*)/) {
+      $start = HexExtend($1);
+      $finish = HexExtend($2);
+      $offset = $zero_offset;
+      $lib = FindLibrary($5);
+
     } else {
       next;
     }
@@ -4382,6 +4399,7 @@ sub ParseLibraries {
       }
     }
 
+    if($main::opt_debug) { printf STDERR "$start:$finish ($offset) $lib\n"; }
     push(@{$result}, [$lib, $start, $finish, $offset]);
   }
 
diff --git a/src/prof.c b/src/prof.c
index 1d8ccbd6..ede89a7a 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -11,6 +11,12 @@
 #include <unwind.h>
 #endif
 
+#ifdef __FreeBSD__
+#define PROCESS_VMEM_MAP "/proc/curproc/map"
+#else
+#define PROCESS_VMEM_MAP "/proc/%d/maps"
+#endif
+
 /******************************************************************************/
 /* Data. */
 
@@ -936,7 +942,7 @@ prof_dump_maps(bool propagate_err)
 
 	cassert(config_prof);
 
-	malloc_snprintf(filename, sizeof(filename), "/proc/%d/maps",
+	malloc_snprintf(filename, sizeof(filename), PROCESS_VMEM_MAP,
 	    (int)getpid());
 	mfd = open(filename, O_RDONLY);
 	if (mfd != -1) {

From 4bbf8181f384d6bd8a634b22543f83e5b949b609 Mon Sep 17 00:00:00 2001
From: Harald Weppner <harald.weppner@tidalscale.com>
Date: Tue, 18 Mar 2014 00:00:14 -0700
Subject: [PATCH 2/3] Consistently use debug lib(s) if present

Fixes a situation where nm uses the debug lib but
addr2line does not, which completely messes up the symbol
lookup.
---
 bin/pprof | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/pprof b/bin/pprof
index 08c9ea31..a309943c 100755
--- a/bin/pprof
+++ b/bin/pprof
@@ -4607,6 +4607,12 @@ sub ExtractSymbols {
     my $finish = $lib->[2];
     my $offset = $lib->[3];
 
+    # Use debug library if it exists
+    my $debug_libname = DebuggingLibrary($libname);
+    if ($debug_libname) {
+        $libname = $debug_libname;
+    }
+
     # Get list of pcs that belong in this library.
     my $contained = [];
     my ($start_pc_index, $finish_pc_index);
@@ -5037,7 +5043,7 @@ sub GetProcedureBoundariesViaNm {
 
       # Tag this routine with the starting address in case the image
       # has multiple occurrences of this routine.  We use a syntax
-      # that resembles template paramters that are automatically
+      # that resembles template parameters that are automatically
       # stripped out by ShortFunctionName()
       $this_routine .= "<$start_val>";
 

From c2da2591befa5574cf8c930a5a2cd7f56138658e Mon Sep 17 00:00:00 2001
From: Harald Weppner <harald.weppner@tidalscale.com>
Date: Tue, 18 Mar 2014 00:00:14 -0700
Subject: [PATCH 3/3] Consistently use debug lib(s) if present

Fixes a situation where nm uses the debug lib but
addr2line does not, which completely messes up the symbol
lookup.
---
 src/prof.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/prof.c b/src/prof.c
index ede89a7a..7722b7b4 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -11,12 +11,6 @@
 #include <unwind.h>
 #endif
 
-#ifdef __FreeBSD__
-#define PROCESS_VMEM_MAP "/proc/curproc/map"
-#else
-#define PROCESS_VMEM_MAP "/proc/%d/maps"
-#endif
-
 /******************************************************************************/
 /* Data. */
 
@@ -941,9 +935,12 @@ prof_dump_maps(bool propagate_err)
 	char filename[PATH_MAX + 1];
 
 	cassert(config_prof);
-
-	malloc_snprintf(filename, sizeof(filename), PROCESS_VMEM_MAP,
+#ifdef __FreeBSD__
+	malloc_snprintf(filename, sizeof(filename), "/proc/curproc/map");
+#else
+	malloc_snprintf(filename, sizeof(filename), "/proc/%d/maps",
 	    (int)getpid());
+#endif
 	mfd = open(filename, O_RDONLY);
 	if (mfd != -1) {
 		ssize_t nread;