---

yaml
---
r: 12223
b: refs/heads/master
c: b17145b
h: refs/heads/master
i:
  12221: fb2129a
  12219: d88299a
  12215: 92a5dbf
  12207: 98791b5
  12191: 06ffee1
  12159: bc75678
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3ff01361d578d611d3b09c3abca059f7cecd204c
+refs/heads/master: b17145b4ae36f78ed9b53b8875b6822ae59da1ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/memory_region.cpp

@@ -1,6 +1,10 @@
 #include "rust_internal.h"
 #include "memory_region.h"
 
+#if RUSTRT_TRACK_ALLOCATIONS >= 3
+#include <execinfo.h>
+#endif
+
 #if RUSTRT_TRACK_ALLOCATIONS >= 1
 // For some platforms, 16 byte alignment is required.
 #  define PTR_SIZE 16
@@ -148,6 +152,13 @@ memory_region::~memory_region() {
                        header->tag,
                        (uintptr_t) get_data(header));
                 ++leak_count;
+
+#               if RUSTRT_TRACK_ALLOCATIONS >= 3
+                if (_detailed_leaks) {
+                    backtrace_symbols_fd(header->bt + 1,
+                                         header->btframes - 1, 2);
+                }
+#               endif
             }
         }
         assert(leak_count == _live_allocations);
@@ -199,6 +210,12 @@ memory_region::claim_alloc(void *mem) {
     if (_synchronized) { _lock.unlock(); }
 #   endif
 
+#   if RUSTRT_TRACK_ALLOCATIONS >= 3
+    if (_detailed_leaks) {
+        alloc->btframes = ::backtrace(alloc->bt, 32);
+    }
+#   endif
+
     add_alloc();
 }
 

trunk/src/rt/memory_region.h

@@ -16,6 +16,7 @@
 // 0 --- no headers, no debugging support
 // 1 --- support poison, but do not track allocations
 // 2 --- track allocations in detail
+// 3 --- record backtraces of every allocation
 //
 // NB: please do not commit code with level 2. It's
 // hugely expensive and should only be used as a last resort.
@@ -31,6 +32,10 @@ class memory_region {
         int index;
         const char *tag;
         uint32_t size;
+#       if RUSTRT_TRACK_ALLOCATIONS >= 3
+        void *bt[32];
+        int btframes;
+#       endif
 #       endif
     };