Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't fail if execinfo is not available 

Previously, cmake aborted when execinfo was not found. With this commit the
backtrace code is just disabled when execinfo is not available.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2010-08-12 20:14:56 +02:00
parent ce814b4dbf
commit 46048332b0
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awesomeConfig.cmake
View File

@ -167,15 +167,24 @@ endmacro()
a_find_library(LIB_EV ev) a_find_library(LIB_EV ev)
# GNU libc has <execinfo.h> and backtrace() stuff. If this is not available, we # GNU libc has <execinfo.h> and backtrace() stuff. If this is not available, we
# need libexecinfo. # need libexecinfo.
message(STATUS "checking for execinfo")
try_compile(HAS_EXECINFO try_compile(HAS_EXECINFO
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/build-tests/execinfo.c) ${CMAKE_SOURCE_DIR}/build-tests/execinfo.c)
if(NOT HAS_EXECINFO) if(NOT HAS_EXECINFO)
a_find_library(LIB_EXECINFO execinfo) find_library(LIB_EXECINFO execinfo)
if(LIB_EXECINFO)
set(HAS_EXECINFO 1)
set(AWESOME_REQUIRED_LIBRARIES set(AWESOME_REQUIRED_LIBRARIES
${AWESOME_REQUIRED_LIBRARIES} ${AWESOME_REQUIRED_LIBRARIES}
${LIB_EXECINFO}) ${LIB_EXECINFO})
endif() endif()
endif()
if(HAS_EXECINFO)
message(STATUS "checking for execinfo -- found")
else()
message(STATUS "checking for execinfo -- not found")
endif()
# Error check # Error check
if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug

11
common/backtrace.c
View File

@ -19,9 +19,13 @@
* *
*/ */
#include <execinfo.h> #include "config.h"
#include "common/backtrace.h" #include "common/backtrace.h"
#ifdef HAS_EXECINFO
#include <execinfo.h>
#endif
#define MAX_STACK_SIZE 32 #define MAX_STACK_SIZE 32
/** Get a backtrace. /** Get a backtrace.
@ -30,6 +34,9 @@
void void
backtrace_get(buffer_t *buf) backtrace_get(buffer_t *buf)
{ {
buffer_init(buf);
#ifdef HAS_EXECINFO
void *stack[MAX_STACK_SIZE]; void *stack[MAX_STACK_SIZE];
char **bt; char **bt;
int stack_size; int stack_size;
@ -37,7 +44,6 @@ backtrace_get(buffer_t *buf)
stack_size = backtrace(stack, countof(stack)); stack_size = backtrace(stack, countof(stack));
bt = backtrace_symbols(stack, stack_size); bt = backtrace_symbols(stack, stack_size);
buffer_init(buf);
if(bt) if(bt)
{ {
for(int i = 0; i < stack_size; i++) for(int i = 0; i < stack_size; i++)
@ -49,6 +55,7 @@ backtrace_get(buffer_t *buf)
p_delete(&bt); p_delete(&bt);
} }
else else
#endif
buffer_addsl(buf, "Cannot get backtrace symbols."); buffer_addsl(buf, "Cannot get backtrace symbols.");
} }

1
config.h.in
View File

@ -6,5 +6,6 @@
#define AWESOME_IS_BIG_ENDIAN @AWESOME_IS_BIG_ENDIAN@ #define AWESOME_IS_BIG_ENDIAN @AWESOME_IS_BIG_ENDIAN@
#cmakedefine WITH_DBUS #cmakedefine WITH_DBUS
#cmakedefine HAS_EXECINFO
#endif //_CONFIG_H_ #endif //_CONFIG_H_