traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

faulthandler: only log fatal exceptions 

Issue #23848, #26622:

* faulthandler now only logs fatal Windows exceptions.
* write error code as decimal, not as hexadecimal
* replace "Windows exception" with "Windows fatal exception"
This commit is contained in:
Victor Stinner 2016-03-23 14:44:14 +01:00
parent b9e0834f46
commit 412a5e7e23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_faulthandler.py
View File

@ -115,7 +115,7 @@ class FaultHandlerTests(unittest.TestCase):
self.check_error(code, line_number, fatal_error, **kw)
def check_windows_exception(self, code, line_number, name_regex, **kw):
fatal_error = 'Windows exception: %s' % name_regex
fatal_error = 'Windows fatal exception: %s' % name_regex
self.check_error(code, line_number, fatal_error, **kw)
@unittest.skipIf(sys.platform.startswith('aix'),

13
Modules/faulthandler.c
View File

@ -367,8 +367,15 @@ faulthandler_exc_handler(struct _EXCEPTION_POINTERS *exc_info)
{
const int fd = fatal_error.fd;
DWORD code = exc_info->ExceptionRecord->ExceptionCode;
DWORD flags = exc_info->ExceptionRecord->ExceptionFlags;
PUTS(fd, "Windows exception: ");
/* only log fatal exceptions */
if (flags & EXCEPTION_NONCONTINUABLE) {
/* call the next exception handler */
return EXCEPTION_CONTINUE_SEARCH;
}
PUTS(fd, "Windows fatal exception: ");
switch (code)
{
/* only format most common errors */
@ -380,8 +387,8 @@ faulthandler_exc_handler(struct _EXCEPTION_POINTERS *exc_info)
case EXCEPTION_IN_PAGE_ERROR: PUTS(fd, "page error"); break;
case EXCEPTION_STACK_OVERFLOW: PUTS(fd, "stack overflow"); break;
default:
PUTS(fd, "code 0x");
_Py_DumpHexadecimal(fd, code, sizeof(DWORD));
PUTS(fd, "code ");
_Py_DumpDecimal(fd, code, sizeof(DWORD));
}
PUTS(fd, "\n\n");