From f372df0d2c91c91e6c3ae71c7b97d58d7c7c5312 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 8 Oct 2015 19:46:52 -0400 Subject: [PATCH] Allow building with backtrace symbols. --- src/archutils/Unix/BacktraceNames.cpp | 8 +-- src/archutils/Unix/BacktraceNames.h | 6 +- src/archutils/Unix/CrashHandlerChild.cpp | 72 ++++++++++++------------ 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/archutils/Unix/BacktraceNames.cpp b/src/archutils/Unix/BacktraceNames.cpp index 9e25248efb..d7bb8833d5 100644 --- a/src/archutils/Unix/BacktraceNames.cpp +++ b/src/archutils/Unix/BacktraceNames.cpp @@ -97,7 +97,7 @@ RString BacktraceNames::Format() const #if defined(BACKTRACE_LOOKUP_METHOD_DLADDR) /* This version simply asks libdl, which is more robust. */ #include -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -222,7 +222,7 @@ static const char *osx_find_link_edit( const struct mach_header *header ) return NULL; } -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -294,7 +294,7 @@ void BacktraceNames::FromAddr( const void *p ) #elif defined(BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS) /* This version parses backtrace_symbols(), an doesn't need libdl. */ #include -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -342,7 +342,7 @@ void BacktraceNames::FromString( RString s ) } #else #warning Undefined BACKTRACE_LOOKUP_METHOD_* -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = intptr_t(p); Offset = 0; diff --git a/src/archutils/Unix/BacktraceNames.h b/src/archutils/Unix/BacktraceNames.h index 124519585b..4ab2824d50 100644 --- a/src/archutils/Unix/BacktraceNames.h +++ b/src/archutils/Unix/BacktraceNames.h @@ -6,7 +6,7 @@ struct BacktraceNames RString Symbol, File; intptr_t Address; int Offset; - void FromAddr( const void *p ); + void FromAddr( void * const p ); void FromString( RString str ); void Demangle(); RString Format() const; @@ -18,7 +18,7 @@ struct BacktraceNames /* * (c) 2003-2004 Glenn Maynard * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -28,7 +28,7 @@ struct BacktraceNames * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF diff --git a/src/archutils/Unix/CrashHandlerChild.cpp b/src/archutils/Unix/CrashHandlerChild.cpp index 0be00f0aae..05ef4d6b73 100644 --- a/src/archutils/Unix/CrashHandlerChild.cpp +++ b/src/archutils/Unix/CrashHandlerChild.cpp @@ -36,26 +36,26 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers ) fprintf( out, "No backtrace method available.\n"); return; } - + if( !BacktracePointers[0] ) { fprintf( out, "Backtrace was empty.\n"); return; } - + for( int i = 0; BacktracePointers[i]; ++i) { BacktraceNames bn; - bn.FromAddr( BacktracePointers[i] ); + bn.FromAddr( const_cast(BacktracePointers[i]) ); bn.Demangle(); - + /* Don't show the main module name. */ if( bn.File == g_pCrashHandlerArgv0 && !bn.Symbol.empty() ) bn.File = ""; - + if( bn.Symbol == "__libc_start_main" ) break; - + fprintf( out, "%s\n", bn.Format().c_str() ); } } @@ -74,16 +74,16 @@ bool child_read( int fd, void *p, int size ) fprintf( stderr, "Crash handler: error communicating with parent: %s\n", strerror(errno) ); return false; } - + if( ret == 0 ) { fprintf( stderr, "Crash handler: EOF communicating with parent.\n" ); return false; } - + got += ret; } - + return true; } @@ -95,7 +95,7 @@ static void child_process() CrashData crash; if( !child_read(3, &crash, sizeof(CrashData)) ) return; - + /* 2. Read info. */ int size; if( !child_read(3, &size, sizeof(size)) ) @@ -103,15 +103,15 @@ static void child_process() char *Info = new char [size]; if( !child_read(3, Info, size) ) return; - + /* 3. Read AdditionalLog. */ if( !child_read(3, &size, sizeof(size)) ) return; - + char *AdditionalLog = new char [size]; if( !child_read(3, AdditionalLog, size) ) return; - + /* 4. Read RecentLogs. */ int cnt = 0; if( !child_read(3, &cnt, sizeof(cnt)) ) @@ -125,19 +125,19 @@ static void child_process() if( !child_read(3, Recent[i], size) ) return; } - + /* 5. Read CHECKPOINTs. */ if( !child_read(3, &size, sizeof(size)) ) return; - + char *temp = new char [size]; if( !child_read(3, temp, size) ) return; - + vector Checkpoints; split(temp, "$$", Checkpoints); delete [] temp; - + /* 6. Read the crashed thread's name. */ if( !child_read(3, &size, sizeof(size)) ) return; @@ -146,15 +146,15 @@ static void child_process() return; const RString CrashedThread(temp); delete[] temp; - + /* Wait for the child to either finish cleaning up or die. */ fd_set rs; struct timeval timeout = { 5, 0 }; // 5 seconds - + FD_ZERO( &rs ); FD_SET( 3, &rs ); int ret = select( 4, &rs, NULL, NULL, &timeout ); - + if( ret == 0 ) { fputs( "Timeout exceeded.\n", stderr ); @@ -165,10 +165,10 @@ static void child_process() // Keep going. } else - { + { char x; - - // No need to check FD_ISSET( 3, &rs ) because it was the only descriptor in the set. + + // No need to check FD_ISSET( 3, &rs ) because it was the only descriptor in the set. ret = read( 3, &x, sizeof(x) ); if( ret > 0 ) { @@ -182,7 +182,7 @@ static void child_process() /* keep going */ } } - + RString sCrashInfoPath = "/tmp"; #if defined(MACOSX) sCrashInfoPath = CrashHandler::GetLogsDirectory(); @@ -192,14 +192,14 @@ static void child_process() sCrashInfoPath = home; #endif sCrashInfoPath += "/crashinfo.txt"; - + FILE *CrashDump = fopen( sCrashInfoPath, "w+" ); if(CrashDump == NULL) { fprintf( stderr, "Couldn't open " + sCrashInfoPath + ": %s\n", strerror(errno) ); exit(1); } - + fprintf( CrashDump, "%s%s crash report", PRODUCT_FAMILY, product_version ); #if defined(HAVE_VERSION_INFO) fprintf( CrashDump, " (build %s, %s @ %s)", ::sm_version_git_hash, version_date, version_time ); @@ -207,14 +207,14 @@ static void child_process() fprintf( CrashDump, "\n" ); fprintf( CrashDump, "--------------------------------------\n" ); fprintf( CrashDump, "\n" ); - + RString reason; switch( crash.type ) { case CrashData::SIGNAL: { reason = ssprintf( "%s - %s", SignalName(crash.signal), SignalCodeName(crash.signal, crash.si.si_code) ); - + /* Linux puts the PID that sent the signal in si_addr for SI_USER. */ if( crash.si.si_code == SI_USER ) { @@ -238,16 +238,16 @@ static void child_process() reason = crash.reason; break; } - + fprintf( CrashDump, "Architecture: %s\n", HOOKS->GetArchName().c_str() ); fprintf( CrashDump, "Crash reason: %s\n", reason.c_str() ); fprintf( CrashDump, "Crashed thread: %s\n\n", CrashedThread.c_str() ); - + fprintf(CrashDump, "Checkpoints:\n"); for( unsigned i=0; i