Skip to content

gh-105699: Use a _Py_hashtable_t for the PyModuleDef Cache #106974

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
ericsnowcurrently merged 14 commits into from
Jul 28, 2023
Merged

gh-105699: Use a _Py_hashtable_t for the PyModuleDef Cache #106974

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3397777
Add a comment.
ericsnowcurrently Jul 19, 2023
670e632
Add a TODO.
ericsnowcurrently Jul 19, 2023
485d130
Use a low-level hashtable instead of a dict.
ericsnowcurrently Jul 21, 2023
77d5e8f
Drop _PyThreadState_*Detached().
ericsnowcurrently Jul 19, 2023
04a19c4
Set "byname" properly for the reload case.
ericsnowcurrently Jul 24, 2023
5fde127
Use a flat hashtable instead of a nested one.
ericsnowcurrently Jul 27, 2023
818d828
Merge branch 'main' into fix-extensions-tstate-alt
ericsnowcurrently Jul 27, 2023
e83b0cc
Use the right allocator.
ericsnowcurrently Jul 27, 2023
9e81cd5
Use PyUnicode_AsUTF8AndSize() (and fix the assert).
ericsnowcurrently Jul 28, 2023
430716b
Raise MemoryError where appropriate.
ericsnowcurrently Jul 28, 2023
647fbc2
Add a comment.
ericsnowcurrently Jul 28, 2023
bbe5eda
Use a constant for the cache separator character.
ericsnowcurrently Jul 28, 2023
1d7cbd0
Decref when clearing the hashtable.
ericsnowcurrently Jul 28, 2023
20c8b9d
Make the cached module defs immortal.
ericsnowcurrently Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Raise MemoryError where appropriate.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 28, 2023
commit 430716b1b27f5ead37fc6d765e68292d0f401cba
3 changes: 3 additions & 0 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,7 @@ hashtable_key_from_2_strings(PyObject *str1, PyObject *str2, const char sep)

char *key = PyMem_RawMalloc(size);
if (key == NULL) {
PyErr_NoMemory();
return NULL;
}

Expand Down Expand Up @@ -994,6 +995,7 @@ _extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def)
&alloc
);
if (EXTENSIONS.hashtable == NULL) {
PyErr_NoMemory();
goto finally;
}
}
Expand All @@ -1008,6 +1010,7 @@ _extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def)
if (entry == NULL) {
if (_Py_hashtable_set(EXTENSIONS.hashtable, key, Py_NewRef(def)) < 0) {
PyMem_RawFree(key);
PyErr_NoMemory();
goto finally;
}
}
Expand Down