X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fdebug.cpp;h=8647160b1bed7c20cae3dae6e035bfc23bef521e;hb=759fbabaea6fbd21497a1dc62a395af6e385518e;hp=2e4992a78013f752ae51211db4d5d018cda11498;hpb=a0566270d9fa075afa36a7e3e68c690b1b23ba90;p=minetest.git diff --git a/src/debug.cpp b/src/debug.cpp index 2e4992a78..8647160b1 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -18,63 +18,63 @@ with this program; if not, write to the Free Software Foundation, Inc., */ +#include "porting.h" #include "debug.h" +#include "exceptions.h" +#include "threads.h" #include #include #include +#include +#include +#include "threading/mutex.h" +#include "threading/mutex_auto_lock.h" +#include "config.h" + +#ifdef _MSC_VER + #include + #include "version.h" + #include "filesys.h" +#endif + +#if USE_CURSES + #include "terminal_chat_console.h" +#endif /* - Debug output + Assert */ -FILE *g_debugstreams[DEBUGSTREAM_COUNT] = {stderr, NULL}; - -void debugstreams_init(bool disable_stderr, const char *filename) +void sanity_check_fn(const char *assertion, const char *file, + unsigned int line, const char *function) { - if(disable_stderr) - g_debugstreams[0] = NULL; - else - g_debugstreams[0] = stderr; +#if USE_CURSES + g_term_console.stopAndWaitforThread(); +#endif - if(filename) - g_debugstreams[1] = fopen(filename, "a"); - - if(g_debugstreams[1]) - { - fprintf(g_debugstreams[1], "\n\n-------------\n"); - fprintf(g_debugstreams[1], " Separator \n"); - fprintf(g_debugstreams[1], "-------------\n\n"); - } -} + errorstream << std::endl << "In thread " << std::hex + << thr_get_current_thread_id() << ":" << std::endl; + errorstream << file << ":" << line << ": " << function + << ": An engine assumption '" << assertion << "' failed." << std::endl; -void debugstreams_deinit() -{ - if(g_debugstreams[1] != NULL) - fclose(g_debugstreams[1]); -} - -Debugbuf debugbuf(false); -std::ostream dstream(&debugbuf); -Debugbuf debugbuf_no_stderr(true); -std::ostream dstream_no_stderr(&debugbuf_no_stderr); -Nullstream dummyout; + debug_stacks_print_to(errorstream); -/* - Assert -*/ + abort(); +} -void assert_fail(const char *assertion, const char *file, +void fatal_error_fn(const char *msg, const char *file, unsigned int line, const char *function) { - DEBUGPRINT("\nIn thread %lx:\n" - "%s:%d: %s: Assertion '%s' failed.\n", - (unsigned long)get_current_thread_id(), - file, line, function, assertion); - - debug_stacks_print(); +#if USE_CURSES + g_term_console.stopAndWaitforThread(); +#endif + + errorstream << std::endl << "In thread " << std::hex + << thr_get_current_thread_id() << ":" << std::endl; + errorstream << file << ":" << line << ": " << function + << ": A fatal error occured: " << msg << std::endl; - if(g_debugstreams[1]) - fclose(g_debugstreams[1]); + debug_stacks_print_to(errorstream); abort(); } @@ -83,6 +83,18 @@ void assert_fail(const char *assertion, const char *file, DebugStack */ +struct DebugStack +{ + DebugStack(threadid_t id); + void print(FILE *file, bool everything); + void print(std::ostream &os, bool everything); + + threadid_t threadid; + char stack[DEBUG_STACK_SIZE][DEBUG_STACK_TEXT_SIZE]; + int stack_i; // Points to the lowest empty position + int stack_max_i; // Highest i that was seen +}; + DebugStack::DebugStack(threadid_t id) { threadid = id; @@ -93,8 +105,10 @@ DebugStack::DebugStack(threadid_t id) void DebugStack::print(FILE *file, bool everything) { - fprintf(file, "DEBUG STACK FOR THREAD %lx:\n", - (unsigned long)threadid); + std::ostringstream os; + os << threadid; + fprintf(file, "DEBUG STACK FOR THREAD %s:\n", + os.str().c_str()); for(int i=0; i g_debug_stacks; -JMutex g_debug_stacks_mutex; +Mutex g_debug_stacks_mutex; void debug_stacks_init() { - g_debug_stacks_mutex.Init(); } void debug_stacks_print_to(std::ostream &os) { - JMutexAutoLock lock(g_debug_stacks_mutex); + MutexAutoLock lock(g_debug_stacks_mutex); os<<"Debug stacks:"<::iterator - i = g_debug_stacks.begin(); - i != g_debug_stacks.end(); ++i) - { - DebugStack *stack = i->second; - - for(int i=0; iprint(g_debugstreams[i], true); - } - } + debug_stacks_print_to(errorstream); } DebugStacker::DebugStacker(const char *text) { - threadid_t threadid = get_current_thread_id(); + threadid_t threadid = thr_get_current_thread_id(); - JMutexAutoLock lock(g_debug_stacks_mutex); + MutexAutoLock lock(g_debug_stacks_mutex); std::map::iterator n; n = g_debug_stacks.find(threadid); @@ -210,11 +215,11 @@ DebugStacker::DebugStacker(const char *text) DebugStacker::~DebugStacker() { - JMutexAutoLock lock(g_debug_stacks_mutex); - + MutexAutoLock lock(g_debug_stacks_mutex); + if(m_overflowed == true) return; - + m_stack->stack_i--; if(m_stack->stack_i == 0) @@ -227,35 +232,124 @@ DebugStacker::~DebugStacker() } } - #ifdef _MSC_VER -#if CATCH_UNHANDLED_EXCEPTIONS == 1 -void se_trans_func(unsigned int u, EXCEPTION_POINTERS* pExp) + +const char *Win32ExceptionCodeToString(DWORD exception_code) { - dstream<<"In trans_func.\n"; - if(u == EXCEPTION_ACCESS_VIOLATION) - { - PEXCEPTION_RECORD r = pExp->ExceptionRecord; - dstream<<"Access violation at "<ExceptionAddress - <<" write?="<ExceptionInformation[0] - <<" address="<ExceptionInformation[1] - <ExceptionRecord->ExceptionCode; + _snprintf(buf, sizeof(buf), + " >> === FATAL ERROR ===\n" + " >> %s (Exception 0x%08X) at 0x%p\n", + Win32ExceptionCodeToString(excode), excode, + pExceptInfo->ExceptionRecord->ExceptionAddress); + dstream << buf; + + if (minidump_created) + dstream << " >> Saved dump to " << dumpfile << std::endl; + else + dstream << " >> Failed to save dump" << std::endl; + + return EXCEPTION_EXECUTE_HANDLER; +} + +#endif + +void debug_set_exception_handler() +{ +#ifdef _MSC_VER + SetUnhandledExceptionFilter(Win32ExceptionHandler); +#endif +}