anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

print callstack on assert

Browse Source
This commit is contained in:
Peter Kümmel 2014-08-27 19:40:40 +02:00
parent 0d6f17afe2
commit ada262a78b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/support/lassert.cpp
View File

@ -10,6 +10,7 @@
*/
#include <config.h>
#include <lassert.h>
#include "support/convert.h"
#include "support/debug.h"
@ -35,13 +36,21 @@ namespace lyx {
using namespace std;
using namespace support;
// TODO Should we try to print the call stack in the course of these?
void doAssertWithCallstack(bool value)
{
if (!value) {
printCallStack();
BOOST_ASSERT(false);
}
}
void doAssert(char const * expr, char const * file, long line)
{
LYXERR0("ASSERTION " << expr << " VIOLATED IN " << file << ":" << line);
// comment this out if not needed
BOOST_ASSERT(false);
doAssertWithCallstack(false);
}
@ -60,7 +69,7 @@ void doWarnIf(char const * expr, char const * file, long line)
{
docstring const d = _("It should be safe to continue, but you\nmay wish to save your work and restart LyX.");
// comment this out if not needed
BOOST_ASSERT(false);
doAssertWithCallstack(false);
throw ExceptionMessage(WarningException, _("Warning!"),
formatHelper(d, expr, file, line));
}
@ -70,7 +79,7 @@ void doBufErr(char const * expr, char const * file, long line)
{
docstring const d = _("There has been an error with this document.\nLyX will attempt to close it safely.");
// comment this out if not needed
BOOST_ASSERT(false);
doAssertWithCallstack(false);
throw ExceptionMessage(BufferException, _("Buffer Error!"),
formatHelper(d, expr, file, line));
}
@ -80,7 +89,7 @@ void doAppErr(char const * expr, char const * file, long line)
{
docstring const d = _("LyX has encountered an application error\nand will now shut down.");
// comment this out if not needed
BOOST_ASSERT(false);
doAssertWithCallstack(false);
throw ExceptionMessage(ErrorException, _("Fatal Exception!"),
formatHelper(d, expr, file, line));
}

2
src/support/lassert.h
View File

@ -65,6 +65,8 @@ void doWarnIf(char const * expr, char const * file, long line);
void doBufErr(char const * expr, char const * file, long line);
void doAppErr(char const * expr, char const * file, long line);
void doAssertWithCallstack(bool value);
/// Print demangled callstack to stderr
docstring printCallStack();