Skip to content

gh-120837: Update _Py_DumpExtensionModules to be async-signal-safe - #121051

Merged
corona10 merged 8 commits into
python:mainfrom
corona10:gh-120837
Jun 27, 2024
Merged

gh-120837: Update _Py_DumpExtensionModules to be async-signal-safe#121051
corona10 merged 8 commits into
python:mainfrom
corona10:gh-120837

Conversation

@corona10

@corona10corona10 commented Jun 26, 2024•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@bedevere-appbedevere-appBot mentioned this pull request Jun 26, 2024
Closed
corona10
corona10 commented Jun 26, 2024
View reviewed changes
Comment threadPython/pylifecycle.c Outdated
PyMutex *mutex = &obj->ob_mutex;
uint8_t expected = _Py_UNLOCKED;
// Do not wake up other threads.
_Py_atomic_compare_exchange_uint8(&mutex->_bits, &expected, _Py_UNLOCKED);

@corona10corona10Jun 26, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Do we have to run for loop to prevent CAS failure?

@colesburycolesburyJun 26, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this should be a _Py_atomic_store_uint8(&mutex->_bits, _Py_UNLOCKED)

vstinner
vstinner reviewed Jun 26, 2024
View reviewed changes
Comment threadPython/pylifecycle.c Outdated
@corona10
corona10 requested a review from vstinnerJune 27, 2024 11:10
vstinner
vstinner reviewed Jun 27, 2024
View reviewed changes
Comment threadPython/pylifecycle.c Outdated
@corona10
corona10 requested a review from vstinnerJune 27, 2024 11:33
@corona10

corona10 commented Jun 27, 2024

Copy link
Copy Markdown
MemberAuthor

@colesbury PTAL :)

colesbury
colesbury reviewed Jun 27, 2024
View reviewed changes
Comment threadPython/pylifecycle.c Outdated
Comment threadPython/pylifecycle.c Outdated
Comment threadPython/pylifecycle.c Outdated
PyMutex *mutex = &obj->ob_mutex;
uint8_t expected = _Py_UNLOCKED;
// Do not wake up other threads.
_Py_atomic_compare_exchange_uint8(&mutex->_bits, &expected, _Py_UNLOCKED);

@colesburycolesburyJun 26, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this should be a _Py_atomic_store_uint8(&mutex->_bits, _Py_UNLOCKED)

Comment threadPython/pylifecycle.c Outdated
@corona10
corona10 requested a review from colesburyJune 27, 2024 20:53
colesbury
colesbury approved these changes Jun 27, 2024
View reviewed changes

@colesburycolesbury left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, thanks for fixing this!

(I left one minor comment inline. Up to you what you want to do with it.)

Comment threadPython/pylifecycle.c Outdated
Comment on lines +2922 to +2923
#else
return;

@colesburycolesburyJun 27, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The #else return; doesn't do anything. I would delete it, but up to you.

@corona10corona10Jun 27, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Done!

@corona10
corona10 merged commit 1a2e7a7 into python:mainJun 27, 2024
@miss-islington-app

miss-islington-appBot commented Jun 27, 2024

Copy link
Copy Markdown

Thanks @corona10 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 27, 2024
@corona10@miss-islington
pythongh-120837: Update _Py_DumpExtensionModules to be async-signal-s…
eca340e
…afe (pythongh-121051)
(cherry picked from commit 1a2e7a7)
Co-authored-by: Donghee Na <donghee.na@python.org>
@bedevere-app

bedevere-appBot commented Jun 27, 2024

Copy link
Copy Markdown

GH-121107 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Jun 27, 2024
@corona10
corona10 deleted the gh-120837 branch June 27, 2024 21:47
corona10 added a commit that referenced this pull request Jun 27, 2024
@miss-islington@corona10
[3.13]gh-120837: Update _Py_DumpExtensionModules to be async-signal-…
d5441f6
…safe (gh-121051) (gh-121107)
gh-120837: Update _Py_DumpExtensionModules to be async-signal-safe (gh-121051)
(cherry picked from commit 1a2e7a7)
Co-authored-by: Donghee Na <donghee.na@python.org>
mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024
@corona10@mrahtz
pythongh-120837: Update _Py_DumpExtensionModules to be async-signal-s…
91a1a8b
…afe (pythongh-121051)
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
@corona10@noahbkim
pythongh-120837: Update _Py_DumpExtensionModules to be async-signal-s…
d386550
…afe (pythongh-121051)
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@corona10@estyxx
pythongh-120837: Update _Py_DumpExtensionModules to be async-signal-s…
4c103de
…afe (pythongh-121051)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@colesburycolesburycolesbury approved these changes
@ericsnowcurrentlyericsnowcurrentlyAwaiting requested review from ericsnowcurrentlyericsnowcurrently is a code owner
@vstinnervstinnerAwaiting requested review from vstinner

Assignees

No one assigned

Labels

skip newstopic-free-threading

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@corona10@vstinner@colesbury