second part of: change offset arguments to various <T>Buffer::read/merge methods...

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

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index cf6b4a2df44eb6d1463868372a2c8831fcbc3149..8a7cdfafca010d2605e870cca2763ce5e85c1785 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #include "libpbd-config.h"
 
 #include "pbd/stacktrace.h"
+#include "pbd/debug.h"
+#include "pbd/demangle.h"
 #include "pbd/compose.h"
 #include "pbd/pthread_utils.h"
 
@@ -28,8 +30,8 @@
 #include <string>
 
 #ifdef PLATFORM_WINDOWS
-#include <Windows.h>
-#include <DbgHelp.h>
+#include <windows.h>
+#include <dbghelp.h>
 #endif
 
 void
@@ -42,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)
@@ -92,18 +52,18 @@ PBD::stacktrace (std::ostream& out, int levels)
        size_t size;
        char **strings;
        size_t i;
-     
+
        size = backtrace (array, 200);
 
        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);
                }
        } else {
@@ -113,11 +73,18 @@ PBD::stacktrace (std::ostream& out, int levels)
 
 #elif defined (PLATFORM_WINDOWS)
 
-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();
+#if defined DEBUG && !defined CaptureStackBackTrace
+#define CaptureStackBackTrace RtlCaptureStackBackTrace
+
+extern "C" {
+    __declspec(dllimport) USHORT WINAPI CaptureStackBackTrace (
+                                 ULONG  FramesToSkip,
+                                 ULONG  FramesToCapture,
+                                 PVOID  *BackTrace,
+                                 PULONG BackTraceHash
+                             );
 }
+#endif
 
 void
 PBD::stacktrace( std::ostream& out, int)
@@ -131,7 +98,7 @@ PBD::stacktrace( std::ostream& out, int)
        HANDLE         process;
 
        process = GetCurrentProcess();
-       out << "+++++Backtrace process: " <<  pthread_self() << std::endl;
+       out << "+++++Backtrace process: " <<  DEBUG_THREAD_SELF << std::endl;
 
        SymInitialize( process, NULL, TRUE );
 
@@ -155,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 */