Skip to content
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

Jump to bottom

gh-111968: Split _Py_dictkeys_freelist out of _Py_dict_freelist #115505

Merged
merged 4 commits into from
Feb 16, 2024
Merged

gh-111968: Split _Py_dictkeys_freelist out of _Py_dict_freelist #115505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1710e24
gh-111968: Split _Py_dictkeys_freelist out of _Py_dict_freelist
corona10 Feb 15, 2024
2d7619e
Address code review
corona10 Feb 15, 2024
62472aa
Address code review
corona10 Feb 15, 2024
1688fa7
Address code review
corona10 Feb 16, 2024
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
Address code review
  • Loading branch information
@corona10
corona10 committed Feb 15, 2024
commit 2d7619e97baf6568543557bf216b4d9f793f1bb8
2 changes: 0 additions & 2 deletions Include/internal/pycore_freelist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ struct _Py_dict_freelist {
/* Dictionary reuse scheme to save calls to malloc and free */
PyDictObject *free_list[PyDict_MAXFREELIST];
int numfree;
int keys_numfree;
#endif
};

Expand All @@ -81,7 +80,6 @@ struct _Py_dictkeys_freelist {
/* Dictionary keys reuse scheme to save calls to malloc and free */
PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST];
ericsnowcurrently marked this conversation as resolved.
Show resolved Hide resolved
int numfree;
int keys_numfree;
#endif
};

Expand Down
32 changes: 15 additions & 17 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,12 @@ _PyDict_ClearFreeList(struct _Py_object_freelists *freelists, int is_finalizatio
PyObject_GC_Del(op);
}
struct _Py_dictkeys_freelist *dictkeys_freelist = &freelists->dictkeys;
while (dictkeys_freelist->keys_numfree > 0) {
PyMem_Free(dictkeys_freelist->keys_free_list[--dictkeys_freelist->keys_numfree]);
while (dictkeys_freelist->numfree > 0) {
PyMem_Free(dictkeys_freelist->keys_free_list[--dictkeys_freelist->numfree]);
}
if (is_finalization) {
dict_freelist->numfree = -1;
dict_freelist->keys_numfree = -1;
dictkeys_freelist->numfree = -1;
dictkeys_freelist->keys_numfree = -1;
}
#endif
}
Expand Down Expand Up @@ -676,9 +674,9 @@ new_keys_object(PyInterpreterState *interp, uint8_t log2_size, bool unicode)
}

#ifdef WITH_FREELISTS
struct _Py_dictkeys_freelist *dictkey_freelist = get_dictkeys_freelist();
if (log2_size == PyDict_LOG_MINSIZE && unicode && dictkey_freelist->keys_numfree > 0) {
dk = dictkey_freelist->keys_free_list[--dictkey_freelist->keys_numfree];
struct _Py_dictkeys_freelist *freelist = get_dictkeys_freelist();
if (log2_size == PyDict_LOG_MINSIZE && unicode && freelist->numfree > 0) {
dk = freelist->keys_free_list[--freelist->numfree];
OBJECT_STAT_INC(from_freelist);
}
else
Expand Down Expand Up @@ -711,12 +709,12 @@ static void
free_keys_object(PyDictKeysObject *keys)
{
#ifdef WITH_FREELISTS
struct _Py_dictkeys_freelist *dictkey_freelist = get_dictkeys_freelist();
struct _Py_dictkeys_freelist *freelist = get_dictkeys_freelist();
if (DK_LOG_SIZE(keys) == PyDict_LOG_MINSIZE
&& dictkey_freelist->keys_numfree < PyDict_MAXFREELIST
&& dictkey_freelist->keys_numfree >= 0
&& freelist->numfree < PyDict_MAXFREELIST
&& freelist->numfree >= 0
&& DK_IS_UNICODE(keys)) {
dictkey_freelist->keys_free_list[dictkey_freelist->keys_numfree++] = keys;
freelist->keys_free_list[freelist->numfree++] = keys;
OBJECT_STAT_INC(to_freelist);
return;
}
Expand Down Expand Up @@ -756,9 +754,9 @@ new_dict(PyInterpreterState *interp,
PyDictObject *mp;
assert(keys != NULL);
#ifdef WITH_FREELISTS
struct _Py_dict_freelist *dict_freelist = get_dict_freelist();
if (dict_freelist->numfree > 0) {
mp = dict_freelist->free_list[--dict_freelist->numfree];
struct _Py_dict_freelist *freelist = get_dict_freelist();
if (freelist->numfree > 0) {
mp = freelist->free_list[--freelist->numfree];
assert (mp != NULL);
assert (Py_IS_TYPE(mp, &PyDict_Type));
OBJECT_STAT_INC(from_freelist);
Expand Down Expand Up @@ -2606,10 +2604,10 @@ dict_dealloc(PyObject *self)
dictkeys_decref(interp, keys);
}
#ifdef WITH_FREELISTS
struct _Py_dict_freelist *dict_freelist = get_dict_freelist();
if (dict_freelist->numfree < PyDict_MAXFREELIST && dict_freelist->numfree >=0 &&
struct _Py_dict_freelist *freelist = get_dict_freelist();
if (freelist->numfree < PyDict_MAXFREELIST && freelist->numfree >=0 &&
Py_IS_TYPE(mp, &PyDict_Type)) {
dict_freelist->free_list[dict_freelist->numfree++] = mp;
freelist->free_list[freelist->numfree++] = mp;
OBJECT_STAT_INC(to_freelist);
}
else
Expand Down
Loading