-
-
Notifications
You must be signed in to change notification settings - Fork 30.1k
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.
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
gh-112075: Make _PyDict_LoadGlobal thread safe #117529
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1065,7 +1065,6 @@ compare_unicode_generic(PyDictObject *mp, PyDictKeysObject *dk, | |
assert(ep->me_key != NULL); | ||
assert(PyUnicode_CheckExact(ep->me_key)); | ||
assert(!PyUnicode_CheckExact(key)); | ||
// TODO: Thread safety | ||
|
||
if (unicode_get_hash(ep->me_key) == hash) { | ||
PyObject *startkey = ep->me_key; | ||
|
@@ -1192,7 +1191,8 @@ _Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **valu | |
PyDictKeysObject *dk; | ||
DictKeysKind kind; | ||
Py_ssize_t ix; | ||
// TODO: Thread safety | ||
|
||
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp); | ||
start: | ||
dk = mp->ma_keys; | ||
kind = dk->dk_kind; | ||
|
@@ -1390,7 +1390,7 @@ dictkeys_generic_lookup_threadsafe(PyDictObject *mp, PyDictKeysObject* dk, PyObj | |
return do_lookup(mp, dk, key, hash, compare_generic_threadsafe); | ||
} | ||
|
||
static Py_ssize_t | ||
Py_ssize_t | ||
_Py_dict_lookup_threadsafe(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr) | ||
{ | ||
PyDictKeysObject *dk; | ||
|
@@ -2343,11 +2343,12 @@ _PyDict_GetItemStringWithError(PyObject *v, const char *key) | |
* Raise an exception and return NULL if an error occurred (ex: computing the | ||
* key hash failed, key comparison failed, ...). Return NULL if the key doesn't | ||
* exist. Return the value if the key exists. | ||
* | ||
* Returns a new reference. | ||
*/ | ||
PyObject * | ||
_PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key) | ||
{ | ||
// TODO: Thread safety | ||
Py_ssize_t ix; | ||
Py_hash_t hash; | ||
PyObject *value; | ||
|
@@ -2358,17 +2359,31 @@ _PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key) | |
return NULL; | ||
} | ||
|
||
#ifdef Py_GIL_DISABLED | ||
/* namespace 1: globals */ | ||
ix = _Py_dict_lookup(globals, key, hash, &value); | ||
ix = _Py_dict_lookup_threadsafe(globals, key, hash, &value); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this pattern might be simpler if we define We could use it in |
||
if (ix == DKIX_ERROR) | ||
return NULL; | ||
if (ix != DKIX_EMPTY && value != NULL) | ||
return value; | ||
|
||
/* namespace 2: builtins */ | ||
ix = _Py_dict_lookup(builtins, key, hash, &value); | ||
ix = _Py_dict_lookup_threadsafe(builtins, key, hash, &value); | ||
assert(ix >= 0 || value == NULL); | ||
return value; | ||
#else | ||
/* namespace 1: globals */ | ||
ix = _Py_dict_lookup(globals, key, hash, &value); | ||
if (ix == DKIX_ERROR) | ||
return NULL; | ||
if (ix != DKIX_EMPTY && value != NULL) | ||
return Py_NewRef(value); | ||
|
||
/* namespace 2: builtins */ | ||
ix = _Py_dict_lookup(builtins, key, hash, &value); | ||
assert(ix >= 0 || value == NULL); | ||
return Py_XNewRef(value); | ||
#endif | ||
} | ||
|
||
/* Consumes references to key and value */ | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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.
I think we will want it to return a possibly deferred reference soon, but this is good for now.