Skip to content

gh-126076: Account for relocated objects in tracemalloc#126077

Merged
pablogsal merged 8 commits intopython:mainfrom
pablogsal:gh-126076
Nov 19, 2024
Merged

gh-126076: Account for relocated objects in tracemalloc#126077
pablogsal merged 8 commits intopython:mainfrom
pablogsal:gh-126076

Conversation

@pablogsal
Copy link
Member

@pablogsal pablogsal commented Oct 28, 2024 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Oct 28, 2024
Closed
@pablogsal pablogsal requested a review from vstinner October 28, 2024 13:19
@pablogsal
Copy link
Member Author

pablogsal commented Oct 28, 2024

CC @vstinner

vstinner
vstinner reviewed Oct 28, 2024
View reviewed changes
@pablogsal @vstinner
Update Objects/tupleobject.c
ce3cb85 
Co-authored-by: Victor Stinner <vstinner@python.org>
vstinner
vstinner approved these changes Oct 29, 2024
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM. But I suggest adding parenthesis in the macro implementation to avoid macro pitfals.

vstinner
vstinner reviewed Oct 29, 2024
View reviewed changes
@pablogsal
Copy link
Member Author

pablogsal commented Oct 29, 2024

LGTM. But I suggest adding parenthesis in the macro implementation to avoid macro pitfals.

Will do

pablogsal and others added 2 commits October 29, 2024 15:59
@pablogsal @vstinner
Update pycore_object.h
a78ff5f 
Co-authored-by: Victor Stinner <vstinner@python.org>
@pablogsal @vstinner
Update pycore_object.h
a97000f 
Co-authored-by: Victor Stinner <vstinner@python.org>
markshannon
markshannon reviewed Oct 29, 2024
View reviewed changes
Copy link
Member

@markshannon markshannon left a comment

Choose a reason for hiding this comment

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

Can you make sure that all calls to _PyReftracerTrack are directly before the relevant free, to make it easier to merge them when we fix #125790

@pablogsal
Copy link
Member Author

pablogsal commented Oct 29, 2024

Can you make sure that all calls to _PyReftracerTrack are directly before the relevant free, to make it easier to merge them when we fix #125790

Yup!

picnixz
picnixz reviewed Oct 30, 2024
View reviewed changes
Copy link
Member

@picnixz picnixz left a comment

Choose a reason for hiding this comment

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

(I would have suggested using uppercase names for the macro but it wouldn't be consistent with the rest of the macros so I gave up)

@pablogsal @picnixz
Update 2024-10-28-13-18-16.gh-issue-126076.MebZuS.rst
9591820 
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@vstinner
Copy link
Member

vstinner commented Nov 19, 2024

What's the status of this issue?

@pablogsal
Copy link
Member Author

pablogsal commented Nov 19, 2024

I just need to land it after checking that I have addressed everything (I was on vacation 😉)

@pablogsal @picnixz
Update Include/internal/pycore_object.h
a3bd045 
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@pablogsal pablogsal added the needs backport to 3.13 bugs and security fixes label Nov 19, 2024
@pablogsal pablogsal enabled auto-merge (squash) November 19, 2024 10:10
@pablogsal pablogsal merged commit 30aeb00 into python:main Nov 19, 2024
@pablogsal pablogsal deleted the gh-126076 branch November 19, 2024 10:35
@miss-islington-app
Copy link

miss-islington-app bot commented Nov 19, 2024

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

@miss-islington-app
Copy link

miss-islington-app bot commented Nov 19, 2024

Sorry, @pablogsal, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 30aeb00d367d0cc9e5a7603371636cddea09f1c0 3.13

@bedevere-app
Copy link

bedevere-app bot commented Dec 11, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Dec 11, 2024
pablogsal added a commit to pablogsal/cpython that referenced this pull request Dec 11, 2024
@pablogsal
[3.13] pythongh-126076: Account for relocated objects in tracemalloc (p…
93ebd4b 
…ythonGH-126077)

(cherry picked from commit 30aeb00)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
pablogsal added a commit that referenced this pull request Dec 11, 2024
@pablogsal
[3.13] gh-126076: Account for relocated objects in tracemalloc (GH-12…
eb692d9 
…6077) (#127823)

(cherry picked from commit 30aeb00)
ebonnal pushed a commit to ebonnal/cpython that referenced this pull request Jan 12, 2025
@pablogsal @ebonnal
pythongh-126076: Account for relocated objects in tracemalloc (python…
104662d 
…#126077)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@picnixz picnixz picnixz left review comments

@vstinner vstinner Awaiting requested review from vstinner

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees

@pablogsal pablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pablogsal @vstinner @markshannon @picnixz