Added a basic stacktracing for assert and signal failures.
This commit is contained in:
parent
883230abbc
commit
201313a9f8
@ -264,6 +264,7 @@ template class SizeChecker<UInt16, 2>;
|
|||||||
#include "OSSupport/Thread.h"
|
#include "OSSupport/Thread.h"
|
||||||
#include "OSSupport/File.h"
|
#include "OSSupport/File.h"
|
||||||
#include "Logger.h"
|
#include "Logger.h"
|
||||||
|
#include "OSSupport/StackTrace.h"
|
||||||
#else
|
#else
|
||||||
// Logging functions
|
// Logging functions
|
||||||
void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2);
|
void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2);
|
||||||
@ -349,14 +350,14 @@ void inline LOGD(const char* a_Format, ...)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
#define ASSERT( x) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__), assert(0), 0))
|
#define ASSERT( x) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__), PrintStackTrace(), assert(0), 0))
|
||||||
#else
|
#else
|
||||||
#define ASSERT(x) ((void)(x))
|
#define ASSERT(x) ((void)(x))
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Pretty much the same as ASSERT() but stays in Release builds
|
// Pretty much the same as ASSERT() but stays in Release builds
|
||||||
#define VERIFY( x) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0))
|
#define VERIFY( x) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), PrintStackTrace(), exit(1), 0))
|
||||||
|
|
||||||
// Same as assert but in all Self test builds
|
// Same as assert but in all Self test builds
|
||||||
#ifdef SELF_TEST
|
#ifdef SELF_TEST
|
||||||
|
@ -16,8 +16,10 @@ SET (SRCS
|
|||||||
Sleep.cpp
|
Sleep.cpp
|
||||||
Socket.cpp
|
Socket.cpp
|
||||||
SocketThreads.cpp
|
SocketThreads.cpp
|
||||||
|
StackTrace.cpp
|
||||||
Thread.cpp
|
Thread.cpp
|
||||||
Timer.cpp)
|
Timer.cpp
|
||||||
|
)
|
||||||
|
|
||||||
SET (HDRS
|
SET (HDRS
|
||||||
CriticalSection.h
|
CriticalSection.h
|
||||||
@ -32,8 +34,10 @@ SET (HDRS
|
|||||||
Sleep.h
|
Sleep.h
|
||||||
Socket.h
|
Socket.h
|
||||||
SocketThreads.h
|
SocketThreads.h
|
||||||
|
StackTrace.h
|
||||||
Thread.h
|
Thread.h
|
||||||
Timer.h)
|
Timer.h
|
||||||
|
)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
add_library(OSSupport ${SRCS} ${HDRS})
|
add_library(OSSupport ${SRCS} ${HDRS})
|
||||||
|
43
src/OSSupport/StackTrace.cpp
Normal file
43
src/OSSupport/StackTrace.cpp
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
|
||||||
|
// StackTrace.cpp
|
||||||
|
|
||||||
|
// Implements the functions to print current stack traces
|
||||||
|
|
||||||
|
#include "Globals.h"
|
||||||
|
#include "StackTrace.h"
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "../StackWalker.h"
|
||||||
|
#else
|
||||||
|
#include <execinfo.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void PrintStackTrace(void)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
// Reuse the StackWalker from the LeakFinder project already bound to MCS
|
||||||
|
// Define a subclass of the StackWalker that outputs everything to stdout
|
||||||
|
class PrintingStackWalker :
|
||||||
|
public StackWalker
|
||||||
|
{
|
||||||
|
virtual void OnOutput(LPCSTR szText) override
|
||||||
|
{
|
||||||
|
puts(szText);
|
||||||
|
}
|
||||||
|
} sw;
|
||||||
|
sw.ShowCallstack();
|
||||||
|
#else
|
||||||
|
// Use the backtrace() function to get and output the stackTrace:
|
||||||
|
// Code adapted from http://stackoverflow.com/questions/77005/how-to-generate-a-stacktrace-when-my-gcc-c-app-crashes
|
||||||
|
void * stackTrace[30];
|
||||||
|
size_t numItems = backtrace(stackTrace, ARRAYCOUNT(stackTrace));
|
||||||
|
backtrace_symbols_fd(stackTrace, numItems, STDERR_FILENO);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
15
src/OSSupport/StackTrace.h
Normal file
15
src/OSSupport/StackTrace.h
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
// StackTrace.h
|
||||||
|
|
||||||
|
// Declares the functions to print current stack trace
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/** Prints the stacktrace for the current thread. */
|
||||||
|
extern void PrintStackTrace(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#include <dbghelp.h>
|
#include <dbghelp.h>
|
||||||
#endif // _MSC_VER
|
#endif // _MSC_VER
|
||||||
|
#include "OSSupport/StackTrace.h"
|
||||||
|
|
||||||
|
|
||||||
bool cRoot::m_TerminateEventRaised = false; // If something has told the server to stop; checked periodically in cRoot
|
bool cRoot::m_TerminateEventRaised = false; // If something has told the server to stop; checked periodically in cRoot
|
||||||
@ -61,6 +62,7 @@ void NonCtrlHandler(int a_Signal)
|
|||||||
std::signal(SIGSEGV, SIG_DFL);
|
std::signal(SIGSEGV, SIG_DFL);
|
||||||
LOGERROR(" D: | MCServer has encountered an error and needs to close");
|
LOGERROR(" D: | MCServer has encountered an error and needs to close");
|
||||||
LOGERROR("Details | SIGSEGV: Segmentation fault");
|
LOGERROR("Details | SIGSEGV: Segmentation fault");
|
||||||
|
PrintStackTrace();
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
case SIGABRT:
|
case SIGABRT:
|
||||||
@ -71,6 +73,7 @@ void NonCtrlHandler(int a_Signal)
|
|||||||
std::signal(a_Signal, SIG_DFL);
|
std::signal(a_Signal, SIG_DFL);
|
||||||
LOGERROR(" D: | MCServer has encountered an error and needs to close");
|
LOGERROR(" D: | MCServer has encountered an error and needs to close");
|
||||||
LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault");
|
LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault");
|
||||||
|
PrintStackTrace();
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
case SIGINT:
|
case SIGINT:
|
||||||
@ -137,6 +140,9 @@ LONG WINAPI LastChanceExceptionFilter(__in struct _EXCEPTION_POINTERS * a_Except
|
|||||||
g_WriteMiniDump(GetCurrentProcess(), GetCurrentProcessId(), dumpFile, g_DumpFlags, (a_ExceptionInfo) ? &ExcInformation : nullptr, nullptr, nullptr);
|
g_WriteMiniDump(GetCurrentProcess(), GetCurrentProcessId(), dumpFile, g_DumpFlags, (a_ExceptionInfo) ? &ExcInformation : nullptr, nullptr, nullptr);
|
||||||
CloseHandle(dumpFile);
|
CloseHandle(dumpFile);
|
||||||
|
|
||||||
|
// Print the stack trace for the basic debugging:
|
||||||
|
PrintStackTrace();
|
||||||
|
|
||||||
// Revert to old stack:
|
// Revert to old stack:
|
||||||
_asm
|
_asm
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user