Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

fix conflict; assert now uses display_error

Browse Source 
This was SVN commit r2421.
This commit is contained in:
janwas 2005-06-21 16:48:09 +00:00
parent 28e50ab752
commit 6d648d5293
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/lib/sysdep/unix/udbg.cpp
View File

@ -74,8 +74,9 @@ void unix_debug_break()
/* /*
Start the debugger and tell it to attach to the current process/thread Start the debugger and tell it to attach to the current process/thread
(called by display_error)
*/ */
static void launch_debugger() void udbg_launch_debugger()
{ {
pid_t orgpid=getpid(); pid_t orgpid=getpid();
pid_t ret=fork(); pid_t ret=fork();
@ -107,35 +108,9 @@ static void launch_debugger()
// notify the user that an assertion failed. // notify the user that an assertion failed.
ErrorReaction debug_assert_failed(const char* file, int line, const char* expr) ErrorReaction debug_assert_failed(const char* file, int line, const char* expr)
{ {
printf("%s:%d: Assertion `%s' failed.\n", file, line, expr); char buf[200];
do snprintf(buf, ARRAY_SIZE(buf), "%s:%d: Assertion `%s' failed.\n", file, line, expr);
{ display_error(buf);
printf("(B)reak, Launch (D)ebugger, (C)ontinue, (S)uppress or (A)bort? ");
// TODO Should have some kind of timeout here.. in case you're unable to
// access the controlling terminal (As might be the case if launched
// from an xterm and in full-screen mode)
int c=getchar();
if (c == EOF) // I/O Error
return ER_EXIT;
c=tolower(c);
switch (c)
{
case 'd':
launch_debugger();
// fall through
case 'b':
return ER_BREAK;
case 'c':
return ER_CONTINUE;
case 's':
return ER_SUPPRESS;
case 'a':
abort();
default:
continue;
}
} while (false);
} }
void* debug_get_nth_caller(uint n) void* debug_get_nth_caller(uint n)
@ -388,3 +363,9 @@ void debug_printf(const char* fmt, ...)
va_end(args); va_end(args);
fflush(stdout); fflush(stdout);
} }
void debug_disable_leak_reporting()
{
}