Commit 84207844 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

libvlccore: Also print a backtrace on Mac OS X.

Note: We may want to check that at configure time.
parent 3a2e925e
...@@ -1488,7 +1488,7 @@ static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type ) ...@@ -1488,7 +1488,7 @@ static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type )
} }
#ifndef NDEBUG #ifndef NDEBUG
# ifdef __GLIBC__ # if defined(__GLIBC__) || defined(__APPLE__)
# include <execinfo.h> # include <execinfo.h>
# endif # endif
...@@ -1547,7 +1547,7 @@ void vlc_refcheck (vlc_object_t *obj) ...@@ -1547,7 +1547,7 @@ void vlc_refcheck (vlc_object_t *obj)
obj->psz_object_type); obj->psz_object_type);
fflush (stderr); fflush (stderr);
#ifdef __GLIBC__ #if defined(__GLIBC__) || defined(__APPLE__)
void *stack[20]; void *stack[20];
int stackdepth = backtrace (stack, sizeof (stack) / sizeof (stack[0])); int stackdepth = backtrace (stack, sizeof (stack) / sizeof (stack[0]));
backtrace_symbols_fd (stack, stackdepth, 2); backtrace_symbols_fd (stack, stackdepth, 2);
......
...@@ -83,7 +83,7 @@ static inline unsigned long vlc_threadid (void) ...@@ -83,7 +83,7 @@ static inline unsigned long vlc_threadid (void)
return v.i; return v.i;
} }
#ifdef __GLIBC__ #if defined(__GLIBC__) || defined(__APPLE__)
# include <execinfo.h> # include <execinfo.h>
#endif #endif
...@@ -105,10 +105,6 @@ void vlc_pthread_fatal (const char *action, int error, ...@@ -105,10 +105,6 @@ void vlc_pthread_fatal (const char *action, int error,
/* Avoid the strerror_r() prototype brain damage in glibc */ /* Avoid the strerror_r() prototype brain damage in glibc */
errno = error; errno = error;
dprintf (2, " Error message: %m at:\n"); dprintf (2, " Error message: %m at:\n");
void *stack[20];
int len = backtrace (stack, sizeof (stack) / sizeof (stack[0]));
backtrace_symbols_fd (stack, len, 2);
#else #else
char buf[1000]; char buf[1000];
const char *msg; const char *msg;
...@@ -129,6 +125,12 @@ void vlc_pthread_fatal (const char *action, int error, ...@@ -129,6 +125,12 @@ void vlc_pthread_fatal (const char *action, int error,
fflush (stderr); fflush (stderr);
#endif #endif
#if defined(__GLIBC__) || defined(__APPLE__)
void *stack[20];
int len = backtrace (stack, sizeof (stack) / sizeof (stack[0]));
backtrace_symbols_fd (stack, len, 2);
#endif
abort (); abort ();
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment