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-112075: Avoid locking shared keys on every assignment by DinoV · Pull Request #116087 · python/cpython

gh-112075: Avoid locking shared keys on every assignment #116087

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

Merged
DinoV merged 2 commits into python:main from DinoV:nogil_avoid_keys_lock_on_set
Feb 29, 2024

Uh oh!

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

gh-112075: Avoid locking shared keys on every assignment #116087

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22d7bfb
Avoid locking shared keys on every assignment
DinoV Feb 29, 2024
8812f5b
Assert we don't get -1 from hashing exact unicode, lock in _PyObject_…
DinoV Feb 29, 2024
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

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

There are no files selected for viewing

32 changes: 29 additions & 3 deletions 32 Objects/dictobject.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ insertion_resize(PyInterpreterState *interp, PyDictObject *mp, int unicode)
}

static Py_ssize_t
insert_into_splitdictkeys(PyDictKeysObject *keys, PyObject *name)
insert_into_splitdictkeys_locked(PyDictKeysObject *keys, PyObject *name)
Comment thread
DinoV marked this conversation as resolved.
Resolved

Uh oh!

There was an error while loading. Please reload this page.
{
assert(PyUnicode_CheckExact(name));
ASSERT_KEYS_LOCKED(keys);
Expand Down Expand Up @@ -1629,6 +1629,15 @@ insert_into_splitdictkeys(PyDictKeysObject *keys, PyObject *name)
return ix;
}

static Py_ssize_t
insert_into_splitdictkeys(PyDictKeysObject *keys, PyObject *name)
{
LOCK_KEYS(keys);
Comment thread
DinoV marked this conversation as resolved.
Resolved

Uh oh!

There was an error while loading. Please reload this page.
Py_ssize_t ix = insert_into_splitdictkeys_locked(keys, name);
UNLOCK_KEYS(keys);
return ix;
}

static inline int
insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
Py_hash_t hash, PyObject *key, PyObject *value)
Expand Down Expand Up @@ -6692,8 +6701,26 @@ _PyObject_StoreInstanceAttribute(PyObject *obj, PyDictValues *values,
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
Py_ssize_t ix = DKIX_EMPTY;
if (PyUnicode_CheckExact(name)) {
LOCK_KEYS(keys);
#ifdef Py_GIL_DISABLED
Py_hash_t hash = unicode_get_hash(name);
if (hash == -1) {
hash = PyUnicode_Type.tp_hash(name);
if (hash == -1) {
PyErr_Clear();
return DKIX_EMPTY;
Comment thread
DinoV marked this conversation as resolved.
Resolved

Uh oh!

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

// Try a thread-safe lookup to see if the index is already allocated
ix = unicodekeys_lookup_unicode_threadsafe(keys, name, hash);
if (ix == DKIX_EMPTY) {
// Fall back to a version that will lock and maybe insert
ix = insert_into_splitdictkeys(keys, name);
}
#else
ix = insert_into_splitdictkeys(keys, name);
#endif

#ifdef Py_STATS
if (ix == DKIX_EMPTY) {
if (PyUnicode_CheckExact(name)) {
Expand All @@ -6709,7 +6736,6 @@ _PyObject_StoreInstanceAttribute(PyObject *obj, PyDictValues *values,
}
}
#endif
UNLOCK_KEYS(keys);
}
if (ix == DKIX_EMPTY) {
PyObject *dict = make_dict_from_instance_attributes(
Expand Down
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 01402520 — 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.