mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
Normalize the detection for execinfo, so that Linux (glibc) and other platforms
with libexecinfo will generate inline stack backtraces correctly. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -842,7 +842,10 @@ AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [])
|
||||
|
||||
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
|
||||
|
||||
# Non-glibc platforms require libexecinfo for backtrace support
|
||||
AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h])
|
||||
# Linux, however, has backtrace directly in glibc
|
||||
AST_EXT_LIB_CHECK([BKTR], [c], [backtrace], [execinfo.h])
|
||||
|
||||
# possible places for oss definitions
|
||||
AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
|
||||
|
@@ -1163,9 +1163,6 @@
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
|
||||
/* Define like PROTOTYPES; this can be used by system headers. */
|
||||
#undef __PROTOTYPES
|
||||
|
@@ -41,7 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#if ((defined(AST_DEVMODE)) && (defined(linux)))
|
||||
#ifdef HAVE_BKTR
|
||||
#include <execinfo.h>
|
||||
#define MAX_BACKTRACE_FRAMES 20
|
||||
#endif
|
||||
@@ -1082,8 +1082,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
|
||||
|
||||
void ast_backtrace(void)
|
||||
{
|
||||
#ifdef linux
|
||||
#ifdef AST_DEVMODE
|
||||
#ifdef HAVE_BKTR
|
||||
int count=0, i=0;
|
||||
void **addresses;
|
||||
char **strings;
|
||||
@@ -1106,10 +1105,7 @@ void ast_backtrace(void)
|
||||
ast_free(addresses);
|
||||
}
|
||||
#else
|
||||
ast_log(LOG_WARNING, "Must run configure with '--enable-dev-mode' for stack backtraces.\n");
|
||||
#endif
|
||||
#else /* ndef linux */
|
||||
ast_log(LOG_WARNING, "Inline stack backtraces are only available on the Linux platform.\n");
|
||||
ast_log(LOG_WARNING, "Must run configure with '--with-execinfo' for stack backtraces.\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user