Move PBD symbol demangle functions into pbd/demangle.h/cc
Add pbd/demangle.cc source file and move functions from pbd/stacktrace.cc into it
This commit is contained in:
parent
254c1e2c91
commit
5f4f89fb39
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pbd/compose.h"
|
#include "pbd/compose.h"
|
||||||
#include "pbd/stacktrace.h"
|
#include "pbd/demangle.h"
|
||||||
#include "pbd/convert.h"
|
#include "pbd/convert.h"
|
||||||
|
|
||||||
#include "ardour/utils.h"
|
#include "ardour/utils.h"
|
||||||
|
|
67
libs/pbd/demangle.cc
Normal file
67
libs/pbd/demangle.cc
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
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
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "pbd/demangle.h"
|
||||||
|
|
||||||
|
#if defined(__GLIBCXX__)
|
||||||
|
#include <cxxabi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string
|
||||||
|
PBD::symbol_demangle (const std::string& l)
|
||||||
|
{
|
||||||
|
#if defined(__GLIBCXX__)
|
||||||
|
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) {
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
|
@ -52,6 +52,20 @@ namespace PBD
|
||||||
|
|
||||||
return typeid(obj).name();
|
return typeid(obj).name();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param a mangled symbol/name
|
||||||
|
* @return a demangled symbol/name
|
||||||
|
*/
|
||||||
|
LIBPBD_API std::string symbol_demangle(const std::string&);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param a string containing a mangled symbol/name
|
||||||
|
* @return a string with the mangled symbol/name replaced with a demangled
|
||||||
|
* name
|
||||||
|
*/
|
||||||
|
LIBPBD_API std::string demangle(const std::string&);
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
#endif // __libpbd_demangle_h__
|
#endif // __libpbd_demangle_h__
|
||||||
|
|
|
@ -41,7 +41,6 @@ namespace PBD {
|
||||||
|
|
||||||
LIBPBD_API void stacktrace (std::ostream& out, int levels = 0);
|
LIBPBD_API void stacktrace (std::ostream& out, int levels = 0);
|
||||||
LIBPBD_API void trace_twb();
|
LIBPBD_API void trace_twb();
|
||||||
LIBPBD_API std::string demangle (const std::string&);
|
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
class /*LIBPBD_API*/ thing_with_backtrace
|
class /*LIBPBD_API*/ thing_with_backtrace
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "pbd/stacktrace.h"
|
#include "pbd/stacktrace.h"
|
||||||
#include "pbd/debug.h"
|
#include "pbd/debug.h"
|
||||||
|
#include "pbd/demangle.h"
|
||||||
#include "pbd/compose.h"
|
#include "pbd/compose.h"
|
||||||
#include "pbd/pthread_utils.h"
|
#include "pbd/pthread_utils.h"
|
||||||
|
|
||||||
|
@ -43,48 +44,6 @@ PBD::trace_twb ()
|
||||||
#ifdef HAVE_EXECINFO
|
#ifdef HAVE_EXECINFO
|
||||||
|
|
||||||
#include <execinfo.h>
|
#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
|
void
|
||||||
PBD::stacktrace (std::ostream& out, int levels)
|
PBD::stacktrace (std::ostream& out, int levels)
|
||||||
|
@ -127,12 +86,6 @@ extern "C" {
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
void
|
||||||
PBD::stacktrace( std::ostream& out, int)
|
PBD::stacktrace( std::ostream& out, int)
|
||||||
{
|
{
|
||||||
|
@ -169,30 +122,18 @@ PBD::stacktrace( std::ostream& out, int)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
c_stacktrace ()
|
|
||||||
{
|
|
||||||
PBD::stacktrace (std::cout);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
#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
|
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;
|
out << "stack tracing is not enabled on this platform" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
c_stacktrace ()
|
c_stacktrace ()
|
||||||
{
|
{
|
||||||
PBD::stacktrace (std::cout);
|
PBD::stacktrace (std::cout);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* HAVE_EXECINFO */
|
|
||||||
|
|
|
@ -41,6 +41,7 @@ libpbd_sources = [
|
||||||
'crossthread.cc',
|
'crossthread.cc',
|
||||||
'cpus.cc',
|
'cpus.cc',
|
||||||
'debug.cc',
|
'debug.cc',
|
||||||
|
'demangle.cc',
|
||||||
'enumwriter.cc',
|
'enumwriter.cc',
|
||||||
'event_loop.cc',
|
'event_loop.cc',
|
||||||
'enums.cc',
|
'enums.cc',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user