Skip to content

bpo-39877: _PyRuntimeState.finalizing becomes atomic - #18816

Merged
vstinner merged 2 commits into
python:masterfrom
vstinner:atomic_finalizing
Mar 6, 2020
Merged

bpo-39877: _PyRuntimeState.finalizing becomes atomic#18816
vstinner merged 2 commits into
python:masterfrom
vstinner:atomic_finalizing

Conversation

@vstinner

@vstinnervstinner commented Mar 6, 2020

Copy link
Copy Markdown
Member

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.

https://bugs.python.org/issue39877

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.
@vstinner

Copy link
Copy Markdown
MemberAuthor

This PR prepares the code for PR #18811 which does no longer protect _PyRuntimeState.finalizing with the GIL. See discussion: #18811 (comment)

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but need to fix that pesky MSVC failure.

Comment threadInclude/internal/pycore_pystate.h Outdated

static inline void
_PyRuntimeState_SetFinalizing(_PyRuntimeState *runtime, PyThreadState *tstate) {
return _Py_atomic_store_relaxed(&runtime->_finalizing, (uintptr_t)tstate);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the return is confusing MSVC (see CI failures).

@vstinner
vstinner merged commit 7b3c252 into python:masterMar 6, 2020
@vstinner
vstinner deleted the atomic_finalizing branch March 6, 2020 23:24
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@vstinner@pitrou@the-knights-who-say-ni@bedevere-bot