fix compiler warnings.

[ardour.git] / libs / pbd / stacktrace.cc

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index c517967fa22f5a1253cfe9368af78f0d4f66eb29..805b9a2e840e211fd1dac478e364db0071c776f3 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -17,7 +17,10 @@
 
 */
 
-#include <pbd/stacktrace.h>
+#include "libpbd-config.h"
+
+#include "pbd/stacktrace.h"
+#include <cstdio>
 #include <iostream>
 
 void
@@ -30,6 +33,40 @@ PBD::trace_twb ()
 #ifdef HAVE_EXECINFO
 
 #include <execinfo.h>
+#include <cxxabi.h>
+
+std::string demangle (std::string const & l)
+{
+       std::string::size_type const b = l.find_first_of ("(");
+       if (b == std::string::npos) {
+               return l;
+       }
+
+       std::string::size_type const p = l.find_last_of ("+");
+       if (p == std::string::npos) {
+               return l;
+       }
+
+       if ((p - b) <= 1) {
+               return l;
+       }
+       
+       std::string const fn = l.substr (b + 1, p - b - 1);
+
+       int status;
+       try {
+               
+               char* realname = abi::__cxa_demangle (fn.c_str(), 0, 0, &status);
+               std::string d (realname);
+               free (realname);
+               return d;
+               
+       } catch (std::exception) {
+               
+       }
+       
+       return l;
+}
 
 void
 PBD::stacktrace (std::ostream& out, int levels)
@@ -40,24 +77,27 @@ PBD::stacktrace (std::ostream& out, int levels)
        size_t i;
      
        size = backtrace (array, 200);
-       strings = backtrace_symbols (array, size);
-     
-       if (strings) {
 
-               printf ("Obtained %zd stack frames.\n", size);
-               
-               for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
-                       out << strings[i] << std::endl;
+       if (size) {
+               strings = backtrace_symbols (array, size);
+     
+               if (strings) {
+                       
+                       for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
+                               out << "  " << demangle (strings[i]) << std::endl;
+                       }
+                       
+                       free (strings);
                }
-               
-               free (strings);
+       } else {
+               out << "no stacktrace available!" << std::endl;
        }
 }
 
 #else
 
 void
-PBD::stacktrace (std::ostream& out, int levels)
+PBD::stacktrace (std::ostream& out, int /*levels*/)
 {
        out << "stack tracing is not enabled on this platform" << std::endl;
 }