BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Abort at uncatched exceptions

Browse Source 
Change a remaining assert(0) call to FATAL_ERROR(msg).
There was a regression since commit

ced6d20295a8263757d57c02a07ffcb66688a163 "For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives"

where when an "uncatched" exception is thrown inside a "side thread",
the program doesn't abort anymore.

This led to the problem @netinetwalker experienced where the emergethread
got an unhandled exception for loading a mapblock while redis was loading,
(see #3196) and then jmped outside its loop to work down its queue.
This resulted in the server not doing any emerges anymore.
This commit is contained in:
est31 2015-09-27 00:18:05 +02:00
parent 4338f100f8
commit e7282816ff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/debug.h
View File

@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif #endif
// Whether to catch all std::exceptions. // Whether to catch all std::exceptions.
// Assert will be called on such an event. // When "catching", the program will abort with an error message.
// In debug mode, leave these for the debugger and don't catch them. // In debug mode, leave these for the debugger and don't catch them.
#ifdef NDEBUG #ifdef NDEBUG
#define CATCH_UNHANDLED_EXCEPTIONS 1 #define CATCH_UNHANDLED_EXCEPTIONS 1
@ -147,9 +147,9 @@ private:
#define BEGIN_DEBUG_EXCEPTION_HANDLER try { #define BEGIN_DEBUG_EXCEPTION_HANDLER try {
#define END_DEBUG_EXCEPTION_HANDLER(logstream) \ #define END_DEBUG_EXCEPTION_HANDLER(logstream) \
} catch (std::exception &e) { \ } catch (std::exception &e) { \
logstream << "ERROR: An unhandled exception occurred: " \ logstream << "An unhandled exception occurred: " \
<< e.what() << std::endl; \ << e.what() << std::endl; \
assert(0); \ FATAL_ERROR(e.what()); \
} }
#else #else
// Dummy ones // Dummy ones