ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made backtracing more helpful. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2769 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2009-02-17 12:27:03 +00:00
parent b1b4c8e42d
commit 092f8cdbff
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/zm_signal.cpp
View File

@ -47,6 +47,8 @@ RETSIGTYPE zm_term_handler( int signal )
zm_terminate = true; zm_terminate = true;
} }
#define TRACE_SIZE 16
#if HAVE_STRUCT_SIGCONTEXT #if HAVE_STRUCT_SIGCONTEXT
RETSIGTYPE zm_die_handler( int signal, struct sigcontext context ) RETSIGTYPE zm_die_handler( int signal, struct sigcontext context )
#elif ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T ) #elif ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
@ -56,27 +58,38 @@ RETSIGTYPE zm_die_handler( int signal, siginfo_t *info, void *context )
RETSIGTYPE zm_die_handler( int signal ) RETSIGTYPE zm_die_handler( int signal )
#endif #endif
{ {
if ( signal == SIGABRT )
{
#if HAVE_STRSIGNAL #if HAVE_STRSIGNAL
Info( "Got signal %d (%s), crashing", signal, strsignal(signal) ); Info( "Got signal %d (%s), exiting and forcing backtrace", signal, strsignal(signal) );
#else // HAVE_STRSIGNAL #else // HAVE_STRSIGNAL
Error( "Got signal %d, crashing", signal ); Error( "Got signal %d, exiting and forcing backtrace", signal );
#endif // HAVE_STRSIGNAL #endif // HAVE_STRSIGNAL
}
else
{
#if HAVE_STRSIGNAL
Info( "Got signal %d (%s), crashing", signal, strsignal(signal) );
#else // HAVE_STRSIGNAL
Error( "Got signal %d, crashing", signal );
#endif // HAVE_STRSIGNAL
}
#ifndef ZM_NO_CRASHTRACE #ifndef ZM_NO_CRASHTRACE
#if ( ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T ) || HAVE_STRUCT_SIGCONTEXT ) #if ( ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T ) || HAVE_STRUCT_SIGCONTEXT )
void *trace[16]; void *trace[TRACE_SIZE];
int trace_size = 0; int trace_size = 0;
#if HAVE_STRUCT_SIGCONTEXT_EIP #if HAVE_STRUCT_SIGCONTEXT_EIP
Error( "Signal address is %p, from %p", (void *)context.cr2, (void *)context.eip ); Error( "Signal address is %p, from %p", (void *)context.cr2, (void *)context.eip );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, TRACE_SIZE );
// overwrite sigaction with caller's address // overwrite sigaction with caller's address
trace[1] = (void *)context.eip; trace[1] = (void *)context.eip;
#elif HAVE_STRUCT_SIGCONTEXT #elif HAVE_STRUCT_SIGCONTEXT
Error( "Signal address is %p, no eip", context.cr2 ); Error( "Signal address is %p, no eip", context.cr2 );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, TRACE_SIZE );
#else // HAVE_STRUCT_SIGCONTEXT #else // HAVE_STRUCT_SIGCONTEXT
if ( info && context ) if ( info && context )
{ {
@ -84,19 +97,33 @@ RETSIGTYPE zm_die_handler( int signal )
Error( "Signal address is %p, from %p", info->si_addr, uc->uc_mcontext.gregs[REG_EIP] ); Error( "Signal address is %p, from %p", info->si_addr, uc->uc_mcontext.gregs[REG_EIP] );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, TRACE_SIZE );
// overwrite sigaction with caller's address // overwrite sigaction with caller's address
trace[1] = (void *) uc->uc_mcontext.gregs[REG_EIP]; trace[1] = (void *) uc->uc_mcontext.gregs[REG_EIP];
} }
#endif // HAVE_STRUCT_SIGCONTEXT #endif // HAVE_STRUCT_SIGCONTEXT
#if HAVE_DECL_BACKTRACE #if HAVE_DECL_BACKTRACE
char **messages = (char **)NULL; char cmd[1024] = "addr2line -e ";
char *cmd_ptr = cmd+strlen(cmd);
messages = backtrace_symbols( trace, trace_size ); // Try and extract the binary path from the last backtrace frame
char **messages = backtrace_symbols( trace, trace_size );
if ( size_t offset = strcspn( messages[trace_size-1], " " ) )
{
snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), messages[trace_size-1] );
cmd_ptr += offset;
}
else
{
cmd_ptr += snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), "/path/to/%s", zm_dbg_name );
}
// skip first stack frame (points here) // skip first stack frame (points here)
for ( int i=1; i < trace_size; ++i ) for ( int i=1; i < trace_size; i++ )
{
Error( "Backtrace: %s", messages[i] ); Error( "Backtrace: %s", messages[i] );
Info( "Backtrace complete" ); cmd_ptr += snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), " %p", trace[i] );
}
Info( "Backtrace complete, please execute the following command for more information" );
Info( cmd );
#endif // HAVE_DECL_BACKTRACE #endif // HAVE_DECL_BACKTRACE
#endif // ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T ) || HAVE_STRUCT_SIGCONTEXT #endif // ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T ) || HAVE_STRUCT_SIGCONTEXT
#endif // ZM_NO_CRASHTRACE #endif // ZM_NO_CRASHTRACE