mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 07:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-37031: Reuse _PyRuntime.main_thread in signalmodule.c (GH-13538)

Browse source 
Remove main_thread and main_interp variables from signalmodule.c:
reuse _PyRuntime which already track the main thread and the main
interpreter.

* Remove #include <sys/types.h> which became useless: getpid() call
  has been removed.
* Add runtime argument to is_main()
* is_main() now gets the interpreter from runtime.
This commit is contained in:
Victor Stinner 2019-05-24 13:43:55 +02:00 • committed by GitHub
parent 2a37f8f55b
commit d8613dc86f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Modules/signalmodule.c
View file

@ -99,10 +99,7 @@ class sigset_t_converter(CConverter):
may not be the thread that received the signal. may not be the thread that received the signal.
*/ */
#include <sys/types.h> /* For pid_t */
#include "pythread.h" #include "pythread.h"
static unsigned long main_thread;
static PyInterpreterState *main_interp;
static volatile struct { static volatile struct {
_Py_atomic_int tripped; _Py_atomic_int tripped;
@ -190,10 +187,12 @@ itimer_retval(struct itimerval *iv)
#endif #endif
static int static int
is_main(void) is_main(_PyRuntimeState *runtime)
{ {
return PyThread_get_thread_ident() == main_thread && unsigned long thread = PyThread_get_thread_ident();
_PyInterpreterState_Get() == main_interp; PyInterpreterState *interp = _PyRuntimeState_GetThreadState(runtime)->interp;
return (thread == runtime->main_thread
&& interp == runtime->interpreters.main);
} }
static PyObject * static PyObject *
@ -474,7 +473,9 @@ signal_signal_impl(PyObject *module, int signalnum, PyObject *handler)
return NULL; return NULL;
} }
#endif #endif
if (!is_main()) {
_PyRuntimeState *runtime = &_PyRuntime;
if (!is_main(runtime)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"signal only works in main thread"); "signal only works in main thread");
return NULL; return NULL;
@ -691,7 +692,8 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
#endif #endif
if (!is_main()) { _PyRuntimeState *runtime = &_PyRuntime;
if (!is_main(runtime)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"set_wakeup_fd only works in main thread"); "set_wakeup_fd only works in main thread");
return NULL; return NULL;
@ -1329,9 +1331,6 @@ PyInit__signal(void)
PyObject *m, *d, *x; PyObject *m, *d, *x;
int i; int i;
main_thread = PyThread_get_thread_ident();
main_interp = _PyInterpreterState_Get();
/* Create the module and add the functions */ /* Create the module and add the functions */
m = PyModule_Create(&signalmodule); m = PyModule_Create(&signalmodule);
if (m == NULL) if (m == NULL)
@ -1622,7 +1621,8 @@ finisignal(void)
int int
PyErr_CheckSignals(void) PyErr_CheckSignals(void)
{ {
if (!is_main()) { _PyRuntimeState *runtime = &_PyRuntime;
if (!is_main(runtime)) {
return 0; return 0;
} }
@ -1716,7 +1716,8 @@ int
PyOS_InterruptOccurred(void) PyOS_InterruptOccurred(void)
{ {
if (_Py_atomic_load_relaxed(&Handlers[SIGINT].tripped)) { if (_Py_atomic_load_relaxed(&Handlers[SIGINT].tripped)) {
if (!is_main()) { _PyRuntimeState *runtime = &_PyRuntime;
if (!is_main(runtime)) {
return 0; return 0;
} }
_Py_atomic_store_relaxed(&Handlers[SIGINT].tripped, 0); _Py_atomic_store_relaxed(&Handlers[SIGINT].tripped, 0);
@ -1744,14 +1745,13 @@ _PySignal_AfterFork(void)
* in both processes if they came in just before the fork() but before * in both processes if they came in just before the fork() but before
* the interpreter had an opportunity to call the handlers. issue9535. */ * the interpreter had an opportunity to call the handlers. issue9535. */
_clear_pending_signals(); _clear_pending_signals();
main_thread = PyThread_get_thread_ident();
main_interp = _PyInterpreterState_Get();
} }
int int
_PyOS_IsMainThread(void) _PyOS_IsMainThread(void)
{ {
return is_main(); _PyRuntimeState *runtime = &_PyRuntime;
return is_main(runtime);
} }
#ifdef MS_WINDOWS #ifdef MS_WINDOWS