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

bpo-1635741: Port faulthandler module to multiphase initialization (GH-21294)

This commit is contained in:
Dong-hee Na 2020-07-04 01:36:47 +09:00 committed by GitHub
parent 3549ca313a
commit c0b214bc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2020-07-03-23-10-02.bpo-1635741.F5coWe.rst Normal file
View File

@ -0,0 +1 @@
Port :mod:`faulthandler` to multiphase initialization.

88
Modules/faulthandler.c
View File

@ -1291,59 +1291,55 @@ static PyMethodDef module_methods[] = {
{NULL, NULL} /* sentinel */
};
static int
PyExec_faulthandler(PyObject *module) {
/* Add constants for unit tests */
#ifdef MS_WINDOWS
/* RaiseException() codes (prefixed by an underscore) */
if (PyModule_AddIntConstant(module, "_EXCEPTION_ACCESS_VIOLATION",
EXCEPTION_ACCESS_VIOLATION)) {
return -1;
}
if (PyModule_AddIntConstant(module, "_EXCEPTION_INT_DIVIDE_BY_ZERO",
EXCEPTION_INT_DIVIDE_BY_ZERO)) {
return -1;
}
if (PyModule_AddIntConstant(module, "_EXCEPTION_STACK_OVERFLOW",
EXCEPTION_STACK_OVERFLOW)) {
return -1;
}
/* RaiseException() flags (prefixed by an underscore) */
if (PyModule_AddIntConstant(module, "_EXCEPTION_NONCONTINUABLE",
EXCEPTION_NONCONTINUABLE)) {
return -1;
}
if (PyModule_AddIntConstant(module, "_EXCEPTION_NONCONTINUABLE_EXCEPTION",
EXCEPTION_NONCONTINUABLE_EXCEPTION)) {
return -1;
}
#endif
return 0;
}
static PyModuleDef_Slot faulthandler_slots[] = {
{Py_mod_exec, PyExec_faulthandler},
{0, NULL}
};
static struct PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
"faulthandler",
module_doc,
0, /* non-negative size to be able to unload the module */
module_methods,
NULL,
faulthandler_traverse,
NULL,
NULL
.m_name = "faulthandler",
.m_doc = module_doc,
.m_methods = module_methods,
.m_traverse = faulthandler_traverse,
.m_slots = faulthandler_slots
};
PyMODINIT_FUNC
PyInit_faulthandler(void)
{
PyObject *m = PyModule_Create(&module_def);
if (m == NULL)
return NULL;
/* Add constants for unit tests */
#ifdef MS_WINDOWS
/* RaiseException() codes (prefixed by an underscore) */
if (PyModule_AddIntConstant(m, "_EXCEPTION_ACCESS_VIOLATION",
EXCEPTION_ACCESS_VIOLATION)) {
goto error;
}
if (PyModule_AddIntConstant(m, "_EXCEPTION_INT_DIVIDE_BY_ZERO",
EXCEPTION_INT_DIVIDE_BY_ZERO)) {
goto error;
}
if (PyModule_AddIntConstant(m, "_EXCEPTION_STACK_OVERFLOW",
EXCEPTION_STACK_OVERFLOW)) {
goto error;
}
/* RaiseException() flags (prefixed by an underscore) */
if (PyModule_AddIntConstant(m, "_EXCEPTION_NONCONTINUABLE",
EXCEPTION_NONCONTINUABLE)) {
goto error;
}
if (PyModule_AddIntConstant(m, "_EXCEPTION_NONCONTINUABLE_EXCEPTION",
EXCEPTION_NONCONTINUABLE_EXCEPTION)) {
goto error;
}
#endif
return m;
#ifdef MS_WINDOWS
error:
Py_DECREF(m);
return NULL;
#endif
return PyModuleDef_Init(&module_def);
}
static int