GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-74929: Make containment checks more efficient in `FrameLocalsProxy` by gaogaotiantian · Pull Request #118624 · python/cpython

Conversation

@gaogaotiantian

@gaogaotiantian gaogaotiantian commented May 6, 2024 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

Currently the more efficient contains function is not used when someone does key in frame.f_locals because that defaults to sq_contains and it's not properly hooked. The function is only called when using frame.f_locals.__contains__(key).

This hooks sq_contains so the in operation is much more efficient.

  • Issue: Local variable assignment is broken when combined with threads + tracing + closures #74929

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@gaogaotiantian
Make contains work properly for framelocalsproxy
2aacf93
@gaogaotiantian
gaogaotiantian requested a review from markshannon as a code owner May 6, 2024 04:01
@gaogaotiantian
gaogaotiantian requested review from gvanrossum and removed request for markshannon May 6, 2024 04:01
@bedevere-app bedevere-app Bot added the awaiting review label May 6, 2024
@bedevere-app bedevere-app Bot mentioned this pull request May 6, 2024
Local variable assignment is broken when combined with threads + tracing + closures #74929
Closed
@gaogaotiantian gaogaotiantian added the skip news label May 6, 2024
@gaogaotiantian
gaogaotiantian requested a review from markshannon May 6, 2024 04:01
@gvanrossum

gvanrossum commented May 6, 2024

Copy link
Copy Markdown
Member

Is this a correctness issue or merely a performance issue?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@gaogaotiantian

gaogaotiantian commented May 6, 2024

Copy link
Copy Markdown
Member Author

This is merely a performance issue. Without this change, the CONTAINS_OP will treat the proxy as a normal iterable and check the keys one by one. The iter() method worked fine so the result is correct. A list of keys will be generated and iterated.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@ncoghlan ncoghlan changed the title gh-74929: Make contains work properly for FrameLocalsProxy gh-74929: Make containment checks more efficient in FrameLocalsProxy May 6, 2024
ncoghlan
ncoghlan approved these changes May 6, 2024
View reviewed changes

@ncoghlan ncoghlan left a comment •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM! (PR title tweaked to better reflect its purpose)

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
gvanrossum reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting review labels May 6, 2024
@ncoghlan
ncoghlan merged commit afbe5bf into python:main May 6, 2024
@bedevere-app bedevere-app Bot removed the awaiting merge label May 6, 2024
@gaogaotiantian
gaogaotiantian deleted the frameproxy-contain branch May 6, 2024 17:28
SonicField pushed a commit to SonicField/cpython that referenced this pull request May 8, 2024
@gaogaotiantian @SonicField
pythongh-74929: Make containment checks more efficient in `FrameLocal…
e01dae6 
…sProxy` (python#118624)

Properly implement the `sq_contains` slot for frame locals proxy containment checks.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ncoghlan ncoghlan ncoghlan approved these changes
@gvanrossum gvanrossum Awaiting requested review from gvanrossum
@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

@gaogaotiantian @gvanrossum @ncoghlan
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.