Skip to content

gh-135557: Use atomic writes on heapq operations #135601

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.

Sign up for GitHub

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
Merged
merged 13 commits into from
Jun 21, 2025
Merged

gh-135557: Use atomic writes on heapq operations #135601

merged 13 commits into from
Jun 21, 2025

Conversation

@xuantengh
Copy link
Contributor

@xuantengh xuantengh commented Jun 17, 2025 •
edited by bedevere-app bot
Loading

Use atomic writes on heapq operation.

@xuantengh xuantengh requested a review from rhettinger as a code owner June 17, 2025 05:22
@bedevere-app bedevere-app bot mentioned this pull request Jun 17, 2025
Closed
@xuantengh xuantengh changed the title gh-135557: Fix lock-free list access on heapq gh-135557: Use atomic writes on heapq operations Jun 17, 2025
@xuantengh
Copy link
Contributor Author

I think this could be "skip news"?

@rhettinger rhettinger removed their request for review June 17, 2025 12:51
@ZeroIntensity
Copy link
Member

I think this could be "skip news"?

This is user-facing, so this does need a news. Something like "Fix race with lists and heapq on the free threaded build" would be fine. It would also be good to get a test. (Sorry for pushing back on both your PRs!)

@ZeroIntensity ZeroIntensity added the needs backport to 3.14 bugs and security fixes label Jun 17, 2025
ZeroIntensity
ZeroIntensity reviewed Jun 17, 2025
View reviewed changes
@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from f7fbb68 to 08770ec Compare June 17, 2025 16:16
ZeroIntensity
ZeroIntensity reviewed Jun 17, 2025
View reviewed changes
kumaraditya303
kumaraditya303 reviewed Jun 17, 2025
View reviewed changes
@python-cla-bot
Copy link

python-cla-bot bot commented Jun 18, 2025 •
edited
Loading

All commit authors signed the Contributor License Agreement.

CLA signed

@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from 0184b21 to 463963d Compare June 18, 2025 06:38
kumaraditya303
kumaraditya303 reviewed Jun 18, 2025
View reviewed changes
kumaraditya303
kumaraditya303 reviewed Jun 18, 2025
View reviewed changes
@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from 463963d to c49ff7d Compare June 19, 2025 00:48
kumaraditya303
kumaraditya303 reviewed Jun 19, 2025
View reviewed changes
@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from c49ff7d to 27d6cb6 Compare June 19, 2025 10:31
ZeroIntensity
ZeroIntensity reviewed Jun 19, 2025
View reviewed changes
@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from 2cc859d to 8cf4794 Compare June 19, 2025 13:17
@xuantengh xuantengh force-pushed the heap-list-lock-free-read branch from 8cf4794 to 32d767f Compare June 19, 2025 13:42
kumaraditya303
kumaraditya303 reviewed Jun 19, 2025
View reviewed changes
@ZeroIntensity
Copy link
Member

!buildbot nogil

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @ZeroIntensity for commit a10560e 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F135601%2Fmerge

The command will test the builders whose names match following regular expression: nogil

The builders matched are:

  • ARM64 MacOS M1 NoGIL PR
  • AMD64 Windows Server 2022 NoGIL PR
  • aarch64 Fedora Rawhide NoGIL refleaks PR
  • AMD64 Fedora Rawhide NoGIL PR
  • aarch64 Fedora Rawhide NoGIL PR
  • ARM64 MacOS M1 Refleaks NoGIL PR
  • AMD64 CentOS9 NoGIL Refleaks PR
  • AMD64 Fedora Rawhide NoGIL refleaks PR
  • s390x Fedora Rawhide NoGIL refleaks PR
  • PPC64LE Fedora Rawhide NoGIL PR
  • PPC64LE Fedora Rawhide NoGIL refleaks PR
  • x86-64 MacOS Intel NoGIL PR
  • AMD64 CentOS9 NoGIL PR
  • x86-64 MacOS Intel ASAN NoGIL PR
  • AMD64 Windows PGO NoGIL PR
  • s390x Fedora Rawhide NoGIL PR

ZeroIntensity
ZeroIntensity approved these changes Jun 20, 2025
View reviewed changes
Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

LGTM as well, assuming buildbots pass.

@kumaraditya303 kumaraditya303 merged commit 13cac83 into python:main Jun 21, 2025
58 checks passed
@miss-islington-app
Copy link

Thanks @xuantengh for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 21, 2025
@xuantengh @miss-islington
pythongh-135557: use atomic stores in heapq operations in free-thre…
753cec2 
…ading (pythonGH-135601)

(cherry picked from commit 13cac83)

Co-authored-by: Xuanteng Huang <44627253+xuantengh@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Jun 21, 2025

GH-135787 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Jun 21, 2025
YvesDup
YvesDup reviewed Jun 21, 2025
View reviewed changes
Lib/test/test_free_threading/test_heapq.py
except IndexError:
pass

self.run_concurrently(worker, (), n_threads * 2)
Copy link
Contributor

@YvesDup YvesDup Jun 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Test is successful here because the worker function has no arguments.
But shouldn't the second argument args be a tuple?

Copy link
Contributor

Choose a reason for hiding this comment

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

isn't it an empty tuple here?

kumaraditya303 pushed a commit that referenced this pull request Jun 21, 2025
@miss-islington @xuantengh
[3.14] gh-135557: use atomic stores in heapq operations in free-thr…
e388b29 
…eading (GH-135601) (#135787)

gh-135557: use atomic stores in `heapq` operations in free-threading (GH-135601)
(cherry picked from commit 13cac83)

Co-authored-by: Xuanteng Huang <44627253+xuantengh@users.noreply.github.com>
@YvesDup
Copy link
Contributor

YvesDup commented Jun 23, 2025 •
edited
Loading

isn't it an empty tuple here?

Oh yes it is.
Reading an empty tuple for arguments when creating new threads destabilized me (and then silly). This is because when creating a new Thread with no arguments, the args argument is always omitted (the default is an empty tuple).
Sorry for the noise.

@xuantengh xuantengh deleted the heap-list-lock-free-read branch June 23, 2025 16:26
Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
@xuantengh @Pranjal095
pythongh-135557: use atomic stores in heapq operations in free-thre…
442de3b 
…ading (python#135601)
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@xuantengh @taegyunkim
pythongh-135557: use atomic stores in heapq operations in free-thre…
bb95a55 
…ading (python#135601)
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@xuantengh @Agent-Hellboy
pythongh-135557: use atomic stores in heapq operations in free-thre…
a25c15e 
…ading (python#135601)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mpage mpage mpage left review comments

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@ZeroIntensity ZeroIntensity ZeroIntensity approved these changes

+1 more reviewer

@YvesDup YvesDup YvesDup left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

topic-free-threading

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@xuantengh @ZeroIntensity @bedevere-bot @YvesDup @mpage @kumaraditya303