Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-40010: Optimize signal handling in multithreaded applications (GH-19067)

Browse source 
If a thread different than the main thread gets a signal, the
bytecode evaluation loop is no longer interrupted at each bytecode
instruction to check for pending signals which cannot be handled.
Only the main thread of the main interpreter can handle signals.

Previously, the bytecode evaluation loop was interrupted at each
instruction until the main thread handles signals.

Changes:

* COMPUTE_EVAL_BREAKER() and SIGNAL_PENDING_SIGNALS() no longer set
  eval_breaker to 1 if the current thread cannot handle signals.
* take_gil() now always recomputes eval_breaker.
This commit is contained in:
Victor Stinner 2020-03-19 17:40:12 +01:00 • committed by GitHub
parent 77248a2889
commit 5a3a71dddb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Python/ceval.c
View file

@ -120,6 +120,15 @@ static size_t opcache_global_hits = 0;
static size_t opcache_global_misses = 0;
#endif
/* Only handle signals on the main thread of the main interpreter. */
static int
thread_can_handle_signals(void)
{
return (PyThread_get_thread_ident() == _PyRuntime.main_thread);
}
/* This can set eval_breaker to 0 even though gil_drop_request became
1. We believe this is all right because the eval loop will release
the GIL eventually anyway. */
@ -127,7 +136,8 @@ static size_t opcache_global_misses = 0;
_Py_atomic_store_relaxed( \
&(ceval2)->eval_breaker, \
_Py_atomic_load_relaxed(&(ceval)->gil_drop_request) | \
_Py_atomic_load_relaxed(&(ceval)->signals_pending) | \
(_Py_atomic_load_relaxed(&(ceval)->signals_pending) \
&& thread_can_handle_signals()) | \
_Py_atomic_load_relaxed(&(ceval2)->pending.calls_to_do) | \
(ceval2)->pending.async_exc)
@ -156,10 +166,11 @@ static size_t opcache_global_misses = 0;
COMPUTE_EVAL_BREAKER(ceval, ceval2); \
} while (0)
/* eval_breaker is not set to 1 if thread_can_handle_signals() is false. */
#define SIGNAL_PENDING_SIGNALS(ceval, ceval2) \
do { \
_Py_atomic_store_relaxed(&(ceval)->signals_pending, 1); \
_Py_atomic_store_relaxed(&(ceval2)->eval_breaker, 1); \
COMPUTE_EVAL_BREAKER(ceval, ceval2); \
} while (0)
#define UNSIGNAL_PENDING_SIGNALS(ceval, ceval2) \
@ -540,8 +551,7 @@ handle_signals(PyThreadState *tstate)
{
_PyRuntimeState *runtime = tstate->interp->runtime;
/* Only handle signals on main thread */
if (PyThread_get_thread_ident() != runtime->main_thread) {
if (!thread_can_handle_signals()) {
return 0;
}
/*