Skip to content

GH-133136: Revise QSBR to reduce excess memory held #135473

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
nascheme merged 10 commits into from
Jun 25, 2025
Merged

GH-133136: Revise QSBR to reduce excess memory held #135473

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ef2e30
gh-133136: Limit excess memory held by QSBR
colesbury Jun 3, 2025
ce9232b
Fix unused function warning
colesbury Jun 3, 2025
3978e35
Re-work QSBR deferred advance and processing.
nascheme Jun 11, 2025
0b276ab
Update comments.
nascheme Jun 13, 2025
7ea28ff
Revise based on review feedback.
nascheme Jun 16, 2025
d2f5acc
Revert change to _Py_qsbr_advance().
nascheme Jun 17, 2025
ee13392
Call _PyMem_FreeDelayed() from eval breaker.
nascheme Jun 17, 2025
b568dbb
Merge branch 'origin/main' into gh-133136-qsbr-defer-process
nascheme Jun 17, 2025
f5f7a3f
Merge 'origin/main' into gh-133136-qsbr-defer-process
nascheme Jun 25, 2025
03f01b0
Avoid overflow in deferred memory accumulators.
nascheme Jun 25, 2025
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
Avoid overflow in deferred memory accumulators.
  • Loading branch information
@nascheme
nascheme committed Jun 25, 2025
commit 03f01b0e81ed290a833c9fcd6469306f1c0a0521
10 changes: 10 additions & 0 deletions Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ should_advance_qsbr_for_page(struct _qsbr_thread_state *qsbr, mi_page_t *page)
{
size_t bsize = mi_page_block_size(page);
size_t page_size = page->capacity*bsize;
if (page_size > QSBR_PAGE_MEM_LIMIT) {
qsbr->deferred_page_memory = 0;
return true;
}
qsbr->deferred_page_memory += page_size;
Comment thread
nascheme marked this conversation as resolved.
if (qsbr->deferred_page_memory > QSBR_PAGE_MEM_LIMIT) {
qsbr->deferred_page_memory = 0;
Expand Down Expand Up @@ -1188,6 +1192,12 @@ free_work_item(uintptr_t ptr, delayed_dealloc_cb cb, void *state)
static bool
should_advance_qsbr_for_free(struct _qsbr_thread_state *qsbr, size_t size)
{
if (size > QSBR_FREE_MEM_LIMIT) {
qsbr->deferred_count = 0;
qsbr->deferred_memory = 0;
qsbr->should_process = true;
return true;
}
qsbr->deferred_count++;
qsbr->deferred_memory += size;
Comment thread
nascheme marked this conversation as resolved.
if (qsbr->deferred_count > QSBR_DEFERRED_LIMIT ||
Expand Down