Skip to content

Conversation

@DinoV
Copy link
Contributor

@DinoVDinoV commented Feb 6, 2024

Makes accessing a single element thread safe.

Adds tracking for whether a dictionary is shared or not, but some of this gets duplicated in #115108.

Does not yet deal with all of the atomic assignments that need to happen to make this 100% right, that'll come in a separate PR.

Comment on lines 1792 to 1794
set_keys(mp, new_keys_object(interp, log2_newsize, unicode));
if (mp->ma_keys==NULL){
mp->ma_keys=oldkeys;
set_keys(mp, oldkeys);
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think the possible temporary assignment to NULL is thread-safe without the GIL. Let's assign the result of new_keys_object() to a temporary variable and check that before assigning it to mp->ma_keys.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

When I was looking at this function when you made a comment about it on #114741 I realized that the assignment of it to a new empty table isn't right at all! We really need to allocate the new table, copy everything over, and then we can publish it.

if (hash==-1)
returnNULL;
}
#ifdefPy_GIL_DISABLED
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this differ from PyDict_Contains()? Can we just call that?

PyObject*value;
Py_ssize_tix;

#ifdefPy_GIL_DISABLED
Copy link
Contributor

Choose a reason for hiding this comment

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

This also looks like contains_known_hash

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

Or does contains_known_hash look like this? 🤔

@DinoVDinoVforce-pushed the nogil_dict_get_threadsafe branch from 54095de to af7ddb9CompareFebruary 16, 2024 00:12
Copy link
Contributor

@colesburycolesbury left a comment

Choose a reason for hiding this comment

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

LGTM

@DinoVDinoVforce-pushed the nogil_dict_get_threadsafe branch from af7ddb9 to d608fb3CompareFebruary 21, 2024 00:44
@DinoVDinoV merged commit 5407146 into python:mainFeb 21, 2024
woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
…id locking (python#115109) Makes accessing a single element thread safe and typically lock free
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
…id locking (python#115109) Makes accessing a single element thread safe and typically lock free
@DinoVDinoV deleted the nogil_dict_get_threadsafe branch May 31, 2024 18:23
LukasWoodtli pushed a commit to LukasWoodtli/cpython that referenced this pull request Jan 22, 2025
…id locking (python#115109) Makes accessing a single element thread safe and typically lock free
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@DinoV@colesbury