Adapting the stack-trace on Mac OS X. Got rid of a couple of nasty hacks
This commit is contained in:
Bernhard F.W. Gschaider
parent
74bc4eacdf
commit
bb2113dfc5
2 changed files with 103 additions and 130 deletions
|
|
@ -4,27 +4,46 @@ import sys
|
|||
filename=sys.argv[1]
|
||||
address=sys.argv[2]
|
||||
import re
|
||||
from os import environ,path
|
||||
|
||||
import subprocess
|
||||
fullFile=None
|
||||
if path.exists(filename):
|
||||
fullFile=filename
|
||||
|
||||
p = subprocess.Popen("gdb -batch -x /dev/stdin",
|
||||
shell=True,
|
||||
bufsize=0,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
close_fds=True)
|
||||
for v in ["PATH","LD_LIBRARY_PATH"]:
|
||||
if not fullFile:
|
||||
for d in environ[v].split(':'):
|
||||
if path.exists(path.join(d,filename)):
|
||||
fullFile=path.join(d,filename)
|
||||
break
|
||||
|
||||
(child_stdin, child_stdout) = (p.stdin, p.stdout)
|
||||
child_stdin.write("set sharedlibrary preload-libraries no\n")
|
||||
child_stdin.write("file "+filename+"\n")
|
||||
child_stdin.write("info line *"+address+"\n")
|
||||
result=child_stdout.readline()
|
||||
if not fullFile:
|
||||
fullFile=filename
|
||||
|
||||
answer="??:0"
|
||||
|
||||
match=re.compile('Line (.+) of "(.+)" starts at').match(result)
|
||||
if path.exists(fullFile):
|
||||
import subprocess
|
||||
|
||||
result=subprocess.Popen(["xcrun", "atos",
|
||||
"-o",fullFile,
|
||||
address],
|
||||
stdout=subprocess.PIPE
|
||||
).communicate()[0]
|
||||
match=re.compile('.+ \((.+)\) \((.+)\)').match(result)
|
||||
if match:
|
||||
answer=match.group(2)+":"+match.group(1)
|
||||
answer=match.group(2)+" "+match.group(1)
|
||||
else:
|
||||
import os
|
||||
result=subprocess.Popen(["xcrun", "atos",
|
||||
"-p",str(os.getppid()),
|
||||
address],
|
||||
stdout=subprocess.PIPE
|
||||
).communicate()[0]
|
||||
match=re.compile('.+ \((.+)\) \((.+)\)').match(result)
|
||||
if match:
|
||||
answer=match.group(2)+" "+match.group(1)
|
||||
|
||||
print answer,
|
||||
|
||||
sys.exit(255)
|
||||
|
|
|
|||
|
|
@ -31,10 +31,13 @@ License
|
|||
#include "readHexLabel.H"
|
||||
|
||||
#include <cxxabi.h>
|
||||
#ifndef darwin
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
#include <dlfcn.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef darwin
|
||||
#include <mach-o/dyld.h>
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
|
@ -126,14 +129,17 @@ void printSourceFileAndLine
|
|||
myAddress = nStream.str();
|
||||
}
|
||||
|
||||
#ifndef darwin
|
||||
if (filename[0] == '/')
|
||||
#else
|
||||
if (1)
|
||||
#endif
|
||||
{
|
||||
string line = pOpen
|
||||
(
|
||||
#ifndef darwin
|
||||
"addr2line -f --demangle=auto --exe "
|
||||
#else
|
||||
// "gaddr2line -f --inline --demangle=auto --exe "
|
||||
"addr2line4Mac.py "
|
||||
#endif
|
||||
+ filename
|
||||
|
|
@ -153,7 +159,6 @@ void printSourceFileAndLine
|
|||
else
|
||||
{
|
||||
string cwdLine(line.replaceAll(cwd() + '/', ""));
|
||||
|
||||
string homeLine(cwdLine.replaceAll(home(), '~'));
|
||||
|
||||
os << " at " << homeLine.c_str();
|
||||
|
|
@ -161,102 +166,6 @@ void printSourceFileAndLine
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef darwin
|
||||
|
||||
// Trying to emulate the original backtrace and backtrace_symbol from the glibc
|
||||
// After an idea published by Rush Manbert at http://lists.apple.com/archives/xcode-users/2006/Apr/msg00528.html
|
||||
|
||||
template<int level>
|
||||
void *getStackAddress()
|
||||
{
|
||||
const unsigned int stackLevel=level;
|
||||
return (
|
||||
__builtin_frame_address(level)
|
||||
? __builtin_return_address(stackLevel)
|
||||
: (void *)0
|
||||
);
|
||||
};
|
||||
|
||||
#define GET_STACK_ADDRESS(lvl) \
|
||||
case lvl: {return getStackAddress<lvl>(); break; }
|
||||
|
||||
// please don't laugh. For some reason this is necessary (the compiler won't accept it otherwise)
|
||||
void *getStackAddress(int level)
|
||||
{
|
||||
switch(level) {
|
||||
GET_STACK_ADDRESS(0);
|
||||
GET_STACK_ADDRESS(1);
|
||||
GET_STACK_ADDRESS(2);
|
||||
GET_STACK_ADDRESS(3);
|
||||
GET_STACK_ADDRESS(4);
|
||||
GET_STACK_ADDRESS(5);
|
||||
GET_STACK_ADDRESS(6);
|
||||
GET_STACK_ADDRESS(7);
|
||||
GET_STACK_ADDRESS(8);
|
||||
GET_STACK_ADDRESS(9);
|
||||
GET_STACK_ADDRESS(10);
|
||||
GET_STACK_ADDRESS(11);
|
||||
GET_STACK_ADDRESS(12);
|
||||
GET_STACK_ADDRESS(13);
|
||||
GET_STACK_ADDRESS(14);
|
||||
GET_STACK_ADDRESS(15);
|
||||
GET_STACK_ADDRESS(16);
|
||||
GET_STACK_ADDRESS(17);
|
||||
GET_STACK_ADDRESS(18);
|
||||
GET_STACK_ADDRESS(19);
|
||||
GET_STACK_ADDRESS(20);
|
||||
GET_STACK_ADDRESS(21);
|
||||
default:
|
||||
return (void *)0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
unsigned backtrace(void **bt, unsigned maxAddrs)
|
||||
{
|
||||
unsigned valid=0;
|
||||
bool ok=true;
|
||||
|
||||
for(int level=0;level<maxAddrs;level++) {
|
||||
if(ok) {
|
||||
bt[level]=getStackAddress(level);
|
||||
|
||||
if(bt[level]!=(void *)0) {
|
||||
valid=level;
|
||||
} else {
|
||||
ok=false;
|
||||
}
|
||||
} else {
|
||||
bt[level]=(void *)0;
|
||||
}
|
||||
}
|
||||
|
||||
return valid;
|
||||
}
|
||||
|
||||
// This function is a potential memory leak. But I don't care because the program is terminating anyway
|
||||
char **backtrace_symbols(void **bt,unsigned nr)
|
||||
{
|
||||
char **strings=(char **)malloc(sizeof(char *)*nr);
|
||||
|
||||
for(unsigned i=0;i<nr;i++) {
|
||||
Dl_info info;
|
||||
int result=dladdr(bt[i],&info);
|
||||
|
||||
char tmp[1000];
|
||||
#ifdef darwinIntel64
|
||||
sprintf(tmp,"%s(%s+%p) [%p]",info.dli_fname,info.dli_sname,(void *)((unsigned long)bt[i]-(unsigned long)info.dli_saddr),bt[i]);
|
||||
#else
|
||||
sprintf(tmp,"%s(%s+%p) [%p]",info.dli_fname,info.dli_sname,(void *)((unsigned int)bt[i]-(unsigned int)info.dli_saddr),bt[i]);
|
||||
#endif
|
||||
strings[i]=(char *)malloc(strlen(tmp)+1);
|
||||
strcpy(strings[i],tmp);
|
||||
}
|
||||
|
||||
return strings;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void getSymbolForRaw
|
||||
(
|
||||
|
|
@ -273,7 +182,6 @@ void getSymbolForRaw
|
|||
#ifndef darwin
|
||||
"addr2line -f --demangle=auto --exe "
|
||||
#else
|
||||
// "gaddr2line -f --inline --demangle=auto --exe "
|
||||
"addr2line4Mac.py "
|
||||
#endif
|
||||
+ filename
|
||||
|
|
@ -342,6 +250,7 @@ void error::printStack(Ostream& os)
|
|||
|
||||
os << '#' << label(i) << " ";
|
||||
//os << "Raw : " << msg << "\n\t";
|
||||
#ifndef darwin
|
||||
{
|
||||
string::size_type lPos = msg.find('[');
|
||||
string::size_type rPos = msg.find(']');
|
||||
|
|
@ -371,7 +280,38 @@ void error::printStack(Ostream& os)
|
|||
}
|
||||
|
||||
string::size_type bracketPos = msg.find('(');
|
||||
|
||||
#else
|
||||
string::size_type counter=0;
|
||||
while(msg[counter]!=' ') {
|
||||
counter++;
|
||||
}
|
||||
while(msg[counter]==' ') {
|
||||
counter++;
|
||||
}
|
||||
string::size_type fileStart=counter;
|
||||
while(msg[counter]!=' ') {
|
||||
counter++;
|
||||
}
|
||||
programFile = msg.substr(fileStart,counter-fileStart);
|
||||
if(programFile=="???") {
|
||||
char path[1024];
|
||||
uint32_t size = sizeof(path);
|
||||
if (_NSGetExecutablePath(path, &size) == 0) {
|
||||
programFile=path;
|
||||
} else {
|
||||
programFile="unknownFile";
|
||||
}
|
||||
}
|
||||
while(msg[counter]==' ') {
|
||||
counter++;
|
||||
}
|
||||
string::size_type addrStart=counter;
|
||||
while(msg[counter]!=' ') {
|
||||
counter++;
|
||||
}
|
||||
address = msg.substr(addrStart,counter-addrStart);
|
||||
#endif
|
||||
#ifndef darwin
|
||||
if (bracketPos != string::npos)
|
||||
{
|
||||
string::size_type start = bracketPos+1;
|
||||
|
|
@ -381,7 +321,21 @@ void error::printStack(Ostream& os)
|
|||
if (plusPos != string::npos)
|
||||
{
|
||||
string cName(msg.substr(start, plusPos-start));
|
||||
#else
|
||||
if(1){
|
||||
while(msg[counter]==' ') {
|
||||
counter++;
|
||||
}
|
||||
string::size_type nameStart=counter;
|
||||
while(msg[counter]!=' ') {
|
||||
counter++;
|
||||
}
|
||||
|
||||
string::size_type start = counter;
|
||||
|
||||
if(1) {
|
||||
string cName(msg.substr(nameStart,counter-nameStart));
|
||||
#endif
|
||||
int status;
|
||||
char* cplusNamePtr = abi::__cxa_demangle
|
||||
(
|
||||
|
|
|
|||
Reference in a new issue