From 7b3c252dc7f44d4bdc4c7c82d225ebd09c78f520 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 7 Mar 2020 00:24:23 +0100 Subject: bpo-39877: _PyRuntimeState.finalizing becomes atomic (GH-18816) Convert _PyRuntimeState.finalizing field to an atomic variable: * Rename it to _finalizing * Change its type to _Py_atomic_address * Add _PyRuntimeState_GetFinalizing() and _PyRuntimeState_SetFinalizing() functions * Remove _Py_CURRENTLY_FINALIZING() function: replace it with testing directly _PyRuntimeState_GetFinalizing() value Convert _PyRuntimeState_GetThreadState() to static inline function. --- Python/sysmodule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Python/sysmodule.c') diff --git a/Python/sysmodule.c b/Python/sysmodule.c index bfacf314df..f086514a03 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -289,8 +289,9 @@ _PySys_ClearAuditHooks(void) /* Must be finalizing to clear hooks */ _PyRuntimeState *runtime = &_PyRuntime; PyThreadState *ts = _PyRuntimeState_GetThreadState(runtime); - assert(!ts || _Py_CURRENTLY_FINALIZING(runtime, ts)); - if (!ts || !_Py_CURRENTLY_FINALIZING(runtime, ts)) { + PyThreadState *finalizing = _PyRuntimeState_GetFinalizing(runtime); + assert(!ts || finalizing == ts); + if (!ts || finalizing != ts) { return; } -- cgit v1.2.1