bpo-1635741 port signalmodule to multi-phase init (PEP 489) #22049
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Port the :mod:`signalmodule` extension module to multi-phase initialization | ||
| (:pep:`489`). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1365,77 +1365,60 @@ ITIMER_PROF -- decrements both when the process is executing and\n\ | |
| A signal handler function is called with two arguments:\n\ | ||
| the first is the signal number, the second is the interrupted stack frame."); | ||
|
|
||
|
|
||
|
|
||
| static int | ||
| signal_exec(PyObject *m) | ||
| { | ||
| /* add the functions */ | ||
| #if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT) | ||
| if (!initialized) { | ||
| if (PyStructSequence_InitType2(&SiginfoType, &struct_siginfo_desc) < 0) | ||
|
There was a problem hiding this comment. I would be nice to convert the static type SiginfoType to a heap type, but it can be done later. There was a problem hiding this comment. @vstinner what is the procedure for types defined using PyStructSequence_InitType2? |
||
| return -1; | ||
| } | ||
| Py_INCREF((PyObject*) &SiginfoType); | ||
| PyModule_AddObject(m, "struct_siginfo", (PyObject*) &SiginfoType); | ||
|
There was a problem hiding this comment. Please check for error. On error, DECREF is needed. There was a problem hiding this comment. Maybe you can use There was a problem hiding this comment. @shihai1991 good idea, this simplifies the error handling too. |
||
| initialized = 1; | ||
| #endif | ||
|
|
||
| /* Add some symbolic constants to the module */ | ||
| PyObject *d = PyModule_GetDict(m); | ||
|
|
||
| DefaultHandler = PyLong_FromVoidPtr((void *)SIG_DFL); | ||
| if (!DefaultHandler || | ||
| PyDict_SetItemString(d, "SIG_DFL", DefaultHandler) < 0) { | ||
| return -1; | ||
| } | ||
|
|
||
| IgnoreHandler = PyLong_FromVoidPtr((void *)SIG_IGN); | ||
| if (!IgnoreHandler || | ||
| PyDict_SetItemString(d, "SIG_IGN", IgnoreHandler) < 0) { | ||
| return -1; | ||
| } | ||
|
|
||
| if (PyModule_AddIntMacro(m, NSIG)) | ||
| return -1; | ||
|
|
||
| #ifdef SIG_BLOCK | ||
| if (PyModule_AddIntMacro(m, SIG_BLOCK)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIG_UNBLOCK | ||
| if (PyModule_AddIntMacro(m, SIG_UNBLOCK)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIG_SETMASK | ||
| if (PyModule_AddIntMacro(m, SIG_SETMASK)) | ||
| return -1; | ||
| #endif | ||
|
|
||
| IntHandler = PyDict_GetItemString(d, "default_int_handler"); | ||
| if (!IntHandler) | ||
| return -1; | ||
| Py_INCREF(IntHandler); | ||
|
|
||
| _Py_atomic_store_relaxed(&Handlers[0].tripped, 0); | ||
| for (int i = 1; i < NSIG; i++) { | ||
| void (*t)(int); | ||
| t = PyOS_getsig(i); | ||
| _Py_atomic_store_relaxed(&Handlers[i].tripped, 0); | ||
|
|
@@ -1456,187 +1439,187 @@ PyInit__signal(void) | |
|
|
||
| #ifdef SIGHUP | ||
| if (PyModule_AddIntMacro(m, SIGHUP)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGINT | ||
| if (PyModule_AddIntMacro(m, SIGINT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGBREAK | ||
| if (PyModule_AddIntMacro(m, SIGBREAK)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGQUIT | ||
| if (PyModule_AddIntMacro(m, SIGQUIT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGILL | ||
| if (PyModule_AddIntMacro(m, SIGILL)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGTRAP | ||
| if (PyModule_AddIntMacro(m, SIGTRAP)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGIOT | ||
| if (PyModule_AddIntMacro(m, SIGIOT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGABRT | ||
| if (PyModule_AddIntMacro(m, SIGABRT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGEMT | ||
| if (PyModule_AddIntMacro(m, SIGEMT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGFPE | ||
| if (PyModule_AddIntMacro(m, SIGFPE)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGKILL | ||
| if (PyModule_AddIntMacro(m, SIGKILL)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGBUS | ||
| if (PyModule_AddIntMacro(m, SIGBUS)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGSEGV | ||
| if (PyModule_AddIntMacro(m, SIGSEGV)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGSYS | ||
| if (PyModule_AddIntMacro(m, SIGSYS)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGPIPE | ||
| if (PyModule_AddIntMacro(m, SIGPIPE)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGALRM | ||
| if (PyModule_AddIntMacro(m, SIGALRM)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGTERM | ||
| if (PyModule_AddIntMacro(m, SIGTERM)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGUSR1 | ||
| if (PyModule_AddIntMacro(m, SIGUSR1)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGUSR2 | ||
| if (PyModule_AddIntMacro(m, SIGUSR2)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGCLD | ||
| if (PyModule_AddIntMacro(m, SIGCLD)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGCHLD | ||
| if (PyModule_AddIntMacro(m, SIGCHLD)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGPWR | ||
| if (PyModule_AddIntMacro(m, SIGPWR)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGIO | ||
| if (PyModule_AddIntMacro(m, SIGIO)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGURG | ||
| if (PyModule_AddIntMacro(m, SIGURG)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGWINCH | ||
| if (PyModule_AddIntMacro(m, SIGWINCH)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGPOLL | ||
| if (PyModule_AddIntMacro(m, SIGPOLL)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGSTOP | ||
| if (PyModule_AddIntMacro(m, SIGSTOP)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGTSTP | ||
| if (PyModule_AddIntMacro(m, SIGTSTP)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGCONT | ||
| if (PyModule_AddIntMacro(m, SIGCONT)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGTTIN | ||
| if (PyModule_AddIntMacro(m, SIGTTIN)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGTTOU | ||
| if (PyModule_AddIntMacro(m, SIGTTOU)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGVTALRM | ||
| if (PyModule_AddIntMacro(m, SIGVTALRM)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGPROF | ||
| if (PyModule_AddIntMacro(m, SIGPROF)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGXCPU | ||
| if (PyModule_AddIntMacro(m, SIGXCPU)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGXFSZ | ||
| if (PyModule_AddIntMacro(m, SIGXFSZ)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGRTMIN | ||
| if (PyModule_AddIntMacro(m, SIGRTMIN)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGRTMAX | ||
| if (PyModule_AddIntMacro(m, SIGRTMAX)) | ||
| return -1; | ||
| #endif | ||
| #ifdef SIGINFO | ||
| if (PyModule_AddIntMacro(m, SIGINFO)) | ||
| return -1; | ||
| #endif | ||
|
|
||
| #ifdef ITIMER_REAL | ||
| if (PyModule_AddIntMacro(m, ITIMER_REAL)) | ||
| return -1; | ||
| #endif | ||
| #ifdef ITIMER_VIRTUAL | ||
| if (PyModule_AddIntMacro(m, ITIMER_VIRTUAL)) | ||
| return -1; | ||
| #endif | ||
| #ifdef ITIMER_PROF | ||
| if (PyModule_AddIntMacro(m, ITIMER_PROF)) | ||
| return -1; | ||
| #endif | ||
|
|
||
| #if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER) | ||
| ItimerError = PyErr_NewException("signal.ItimerError", | ||
| PyExc_OSError, NULL); | ||
| if (!ItimerError || | ||
| PyDict_SetItemString(d, "ItimerError", ItimerError) < 0) { | ||
| return -1; | ||
| } | ||
| #endif | ||
|
|
||
| #ifdef CTRL_C_EVENT | ||
| if (PyModule_AddIntMacro(m, CTRL_C_EVENT)) | ||
| return -1; | ||
| #endif | ||
|
|
||
| #ifdef CTRL_BREAK_EVENT | ||
| if (PyModule_AddIntMacro(m, CTRL_BREAK_EVENT)) | ||
| return -1; | ||
| #endif | ||
|
|
||
| #ifdef MS_WINDOWS | ||
|
|
@@ -1645,12 +1628,30 @@ PyInit__signal(void) | |
| #endif | ||
|
|
||
| if (PyErr_Occurred()) { | ||
| return -1; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static PyModuleDef_Slot signal_slots[] = { | ||
| {Py_mod_exec, signal_exec}, | ||
| {0, NULL} | ||
| }; | ||
|
|
||
| static struct PyModuleDef signalmodule = { | ||
| PyModuleDef_HEAD_INIT, | ||
| "_signal", | ||
| .m_doc = module_doc, | ||
| .m_size = 0, | ||
| .m_methods = signal_methods, | ||
| .m_slots = signal_slots | ||
| }; | ||
|
|
||
| PyMODINIT_FUNC | ||
| PyInit__signal(void) | ||
| { | ||
| return PyModuleDef_Init(&signalmodule); | ||
| } | ||
|
|
||
| static void | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The module is called "_signal":