denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backtrace: use atos instead of addr2line on OS X to resolve source lines

Browse Source
This commit is contained in:
Martin Willi
2013-05-06 15:15:24 +02:00
parent 83714577a9
commit 29324299fe
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/backtrace.c
+11 -3
View File
@@ -299,7 +299,7 @@ static bfd_entry_t *get_bfd_entry(char *filename)
/** /**
* Print the source file with line number to file, libbfd variant * Print the source file with line number to file, libbfd variant
*/ */
static void print_sourceline(FILE *file, char *filename, void *ptr) static void print_sourceline(FILE *file, char *filename, void *ptr, void *base)
{ {
bfd_entry_t *entry; bfd_entry_t *entry;
bfd_find_data_t data = { bfd_find_data_t data = {
@@ -334,13 +334,20 @@ void backtrace_deinit() {}
/** /**
* Print the source file with line number to file, slow addr2line variant * Print the source file with line number to file, slow addr2line variant
*/ */
static void print_sourceline(FILE *file, char *filename, void *ptr) static void print_sourceline(FILE *file, char *filename, void *ptr, void* base)
{ {
char buf[1024]; char buf[1024];
FILE *output; FILE *output;
int c, i = 0; int c, i = 0;
#ifdef __APPLE__
snprintf(buf, sizeof(buf), "atos -o %s -l %p %p 2>&1 | tail -n1",
filename, base, ptr);
#else /* !__APPLE__ */
snprintf(buf, sizeof(buf), "addr2line -e %s %p", filename, ptr); snprintf(buf, sizeof(buf), "addr2line -e %s %p", filename, ptr);
#endif /* __APPLE__ */
output = popen(buf, "r"); output = popen(buf, "r");
if (output) if (output)
{ {
@@ -410,7 +417,8 @@ METHOD(backtrace_t, log_, void,
} }
if (detailed && info.dli_fname[0]) if (detailed && info.dli_fname[0])
{ {
print_sourceline(file, (char*)info.dli_fname, ptr); print_sourceline(file, (char*)info.dli_fname,
ptr, info.dli_fbase);
} }
} }
else else