walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve debug output in case of SIGABRT (add hint about assertion) and small refactoring

This commit is contained in:
amai2012 2018-03-20 14:24:45 +01:00
parent e8cccf842f
commit ab02595be1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/cppcheckexecutor.cpp
View File

@ -347,7 +347,7 @@ static const Signalmap_t listofsignals = make_container< Signalmap_t > ()
static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context) static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
{ {
int type = -1; int type = -1;
pid_t killid = getpid(); pid_t killid;
#if defined(__linux__) && defined(REG_ERR) #if defined(__linux__) && defined(REG_ERR)
const ucontext_t* const uc = reinterpret_cast<const ucontext_t*>(context); const ucontext_t* const uc = reinterpret_cast<const ucontext_t*>(context);
killid = (pid_t) syscall(SYS_gettid); killid = (pid_t) syscall(SYS_gettid);
@ -356,13 +356,14 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
} }
#else #else
UNUSED(context); UNUSED(context);
killid = getpid();
#endif #endif
const Signalmap_t::const_iterator it=listofsignals.find(signo); const Signalmap_t::const_iterator it=listofsignals.find(signo);
const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str(); const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str();
bool printCallstack=true; // try to print a callstack? bool printCallstack=true; // try to print a callstack?
bool lowMem=false; // was low-memory condition detected? bool lowMem=false; // was low-memory condition detected? Be careful then! Avoid allocating much more memory then.
bool unexpectedSignal=true; // unexpected indicates things didn't go as they should... bool unexpectedSignal=true; // unexpected indicates program failure
bool terminate=true; // exit process/thread bool terminate=true; // exit process/thread
const bool isAddressOnStack = IsAddressOnStack(info->si_addr); const bool isAddressOnStack = IsAddressOnStack(info->si_addr);
FILE* output = CppCheckExecutor::getExceptionOutput(); FILE* output = CppCheckExecutor::getExceptionOutput();
@ -370,7 +371,13 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
case SIGABRT: case SIGABRT:
fputs("Internal error: cppcheck received signal ", output); fputs("Internal error: cppcheck received signal ", output);
fputs(signame, output); fputs(signame, output);
fputs(" - out of memory?\n", output); fputs(
#ifdef NDEBUG
" - out of memory?\n",
#else
" - out of memory or assertion?\n",
#endif
output);
lowMem=true; // educated guess lowMem=true; // educated guess
break; break;
case SIGBUS: case SIGBUS: