remove use of hardcoded -fPIC compiler flag, and use compiler flag dict instead

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

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index 176c5b8840cd4f3521a55bb3437b581c541afacf..3b308f7db2dea749695a72036706880054d37182 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -21,6 +21,7 @@
 
 #include "pbd/stacktrace.h"
 #include "pbd/debug.h"
+#include "pbd/demangle.h"
 #include "pbd/compose.h"
 #include "pbd/pthread_utils.h"
 
@@ -43,48 +44,6 @@ PBD::trace_twb ()
 #ifdef HAVE_EXECINFO
 
 #include <execinfo.h>
-#include <cxxabi.h>
-
-static std::string
-symbol_demangle (const std::string& l)
-{
-       int status;
-
-       try {
-
-               char* realname = abi::__cxa_demangle (l.c_str(), 0, 0, &status);
-               std::string d (realname);
-               free (realname);
-               return d;
-       } catch (std::exception) {
-
-       }
-
-       return l;
-}
-
-std::string
-PBD::demangle (std::string const & l)
-{
-       std::string::size_type const b = l.find_first_of ("(");
-
-       if (b == std::string::npos) {
-               return symbol_demangle (l);
-       }
-
-       std::string::size_type const p = l.find_last_of ("+");
-       if (p == std::string::npos) {
-               return symbol_demangle (l);
-       }
-
-       if ((p - b) <= 1) {
-               return symbol_demangle (l);
-       }
-
-       std::string const fn = l.substr (b + 1, p - b - 1);
-
-       return symbol_demangle (fn);
-}
 
 void
 PBD::stacktrace (std::ostream& out, int levels)
@@ -119,20 +78,14 @@ PBD::stacktrace (std::ostream& out, int levels)
 
 extern "C" {
     __declspec(dllimport) USHORT WINAPI CaptureStackBackTrace (
-                                 ULONG  FramesToSkip,
-                                 ULONG  FramesToCapture,
+                                 ULONG  SamplesToSkip,
+                                 ULONG  SamplesToCapture,
                                  PVOID  *BackTrace,
                                  PULONG BackTraceHash
                              );
 }
 #endif
 
-std::string
-PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
-{
-       return std::string();
-}
-
 void
 PBD::stacktrace( std::ostream& out, int)
 {
@@ -140,7 +93,7 @@ PBD::stacktrace( std::ostream& out, int)
        const size_t levels = 62; // does not support more then 62 levels of stacktrace
        unsigned int   i;
        void         * stack[ levels ];
-       unsigned short frames;
+       unsigned short samples;
        SYMBOL_INFO  * symbol;
        HANDLE         process;
 
@@ -149,18 +102,18 @@ PBD::stacktrace( std::ostream& out, int)
 
        SymInitialize( process, NULL, TRUE );
 
-       frames               = CaptureStackBackTrace( 0, levels, stack, NULL );
+       samples               = CaptureStackBackTrace( 0, levels, stack, NULL );
 
-       out << "+++++Backtrace frames: " <<  frames << std::endl;
+       out << "+++++Backtrace samples: " <<  samples << std::endl;
 
        symbol               = ( SYMBOL_INFO * )calloc( sizeof( SYMBOL_INFO ) + 256 * sizeof( char ), 1 );
        symbol->MaxNameLen   = 255;
        symbol->SizeOfStruct = sizeof( SYMBOL_INFO );
 
-       for( i = 0; i < frames; i++ )
+       for( i = 0; i < samples; i++ )
        {
                SymFromAddr( process, ( DWORD64 )( stack[ i ] ), 0, symbol );
-               out << string_compose( "%1: %2 - %3\n", frames - i - 1, symbol->Name, symbol->Address );
+               out << string_compose( "%1: %2 - %3\n", samples - i - 1, symbol->Name, symbol->Address );
        }
 
        out.flush();
@@ -169,30 +122,18 @@ PBD::stacktrace( std::ostream& out, int)
 #endif
 }
 
-void
-c_stacktrace ()
-{
-       PBD::stacktrace (std::cout);
-}
-
 #else
 
-std::string
-PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
-{
-       return std::string();
-}
-
 void
 PBD::stacktrace (std::ostream& out, int /*levels*/)
 {
        out << "stack tracing is not enabled on this platform" << std::endl;
 }
 
+#endif
+
 void
 c_stacktrace ()
 {
        PBD::stacktrace (std::cout);
 }
-
-#endif /* HAVE_EXECINFO */