[proxy] web.archive.org — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-39877: _PyRuntimeState.finalizing becomes atomic #18816

Merged
merged 2 commits into from Mar 6, 2020
Merged

bpo-39877: _PyRuntimeState.finalizing becomes atomic #18816

merged 2 commits into from Mar 6, 2020

Conversation

Copy link
Member

vstinner commented Mar 6, 2020 •
edited by bedevere-bot

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

bpo-39877: _PyRuntimeState.finalizing becomes atomic
699e914 
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 requested a review from pitrou Mar 6, 2020
Copy link
Member Author

vstinner commented Mar 6, 2020

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

vstinner mentioned this pull request Mar 6, 2020
Merged
pitrou approved these changes Mar 6, 2020
View changes
Copy link
Member

pitrou left a comment

LGTM, but need to fix that pesky MSVC failure.

Include/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
Member

pitrou Mar 6, 2020

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 merged commit 7b3c252 into python:master Mar 6, 2020
vstinner deleted the atomic_finalizing branch Mar 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

pitrou

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants