X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdebug%2Fbacktrace.cpp;h=f43a9edacccb2655eaaf42e094e4d5f74dd8742f;hb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4;hp=c0bfd9d9ca16158e898b7ecd2625eb9375d3bc6d;hpb=d61b4678e4e4a2a3661a2472dc7349cc9fd5eaad;p=libs%2Fcore.git

diff --git a/source/debug/backtrace.cpp b/source/debug/backtrace.cpp
index c0bfd9d..f43a9ed 100644
--- a/source/debug/backtrace.cpp
+++ b/source/debug/backtrace.cpp
@@ -4,10 +4,15 @@ This file is part of libmspcore
 Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef WIN32
+
+// Must include something to test for glibc
+#include <cstdlib>
+#if !defined(WIN32) && defined(__GLIBC__)
+#include <dlfcn.h>
 #include <execinfo.h>
 #endif
 #include "backtrace.h"
+#include "demangle.h"
 
 using namespace std;
 
@@ -16,17 +21,26 @@ namespace Debug {
 
 Backtrace Backtrace::create()
 {
-#ifndef WIN32
+#if !defined(WIN32) && defined(__GLIBC__)
 	void *addresses[50];
-	int count=::backtrace(addresses, 50);
-
-	char **symbols=backtrace_symbols(addresses, count);
+	int count = ::backtrace(addresses, 50);
 
 	Backtrace bt;
+	Dl_info dli;
 	for(int i=0; i<count; ++i)
-		bt.frames.push_back(StackFrame(addresses[i], symbols[i]));
-
-	free(symbols);
+	{
+		StackFrame frame;
+		frame.address = addresses[i];
+		if(dladdr(addresses[i], &dli))
+		{
+			frame.file = dli.dli_fname;
+			if(dli.dli_sname)
+				frame.symbol = demangle(dli.dli_sname);
+		}
+		else
+			frame.file = "<unknown>";
+		bt.frames.push_back(frame);
+	}
 
 	return bt;
 #else
@@ -36,9 +50,19 @@ Backtrace Backtrace::create()
 
 ostream &operator<<(ostream &out, const Backtrace &bt)
 {
-	const Backtrace::FrameSeq &frames=bt.get_frames();
-	for(Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-		out<<i->address<<" in "<<i->symbol<<'\n';
+	const list<Backtrace::StackFrame> &frames = bt.get_frames();
+	for(list<Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+		out<<*i<<'\n';
+
+	return out;
+}
+
+ostream &operator<<(ostream &out, const Backtrace::StackFrame &sf)
+{
+	out<<sf.address;
+	if(!sf.symbol.empty())
+		out<<" in "<<sf.symbol;
+	out<<" from "<<sf.file;
 
 	return out;
 }