Skip to content

gh-112529: Use GC heaps for GC allocations in free-threaded builds #114157

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
corona10 merged 2 commits into from
Jan 20, 2024
Merged

gh-112529: Use GC heaps for GC allocations in free-threaded builds #114157

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8183e3
gh-112529: Use GC heaps for GC allocations in free-threaded builds
colesbury Jan 16, 2024
b6c3506
Refactor out setting heap based on type
colesbury Jan 18, 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
Refactor out setting heap based on type
  • Loading branch information
@colesbury
colesbury committed Jan 18, 2024
commit b6c3506584dcc15d39fd95895cbb2154ab52b38a
31 changes: 19 additions & 12 deletions Include/internal/pycore_object_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,23 @@ extern "C" {
# error "this header requires Py_BUILD_CORE define"
#endif

#ifdef Py_GIL_DISABLED
static inline mi_heap_t *
_PyObject_GetAllocationHeap(_PyThreadStateImpl *tstate, PyTypeObject *tp)
{
struct _mimalloc_thread_state *m = &tstate->mimalloc;
if (_PyType_HasFeature(tp, Py_TPFLAGS_PREHEADER)) {
return &m->heaps[_Py_MIMALLOC_HEAP_GC_PRE];
}
else if (_PyType_IS_GC(tp)) {
return &m->heaps[_Py_MIMALLOC_HEAP_GC];
}
else {
return &m->heaps[_Py_MIMALLOC_HEAP_OBJECT];
}
}
#endif

// Sets the heap used for PyObject_Malloc(), PyObject_Realloc(), etc. calls in
// Py_GIL_DISABLED builds. We use different heaps depending on if the object
// supports GC and if it has a pre-header. We smuggle the choice of heap
Expand All @@ -24,12 +41,7 @@ _PyObject_MallocWithType(PyTypeObject *tp, size_t size)
#ifdef Py_GIL_DISABLED
_PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
struct _mimalloc_thread_state *m = &tstate->mimalloc;
if (_PyType_HasFeature(tp, Py_TPFLAGS_PREHEADER)) {
m->current_object_heap = &m->heaps[_Py_MIMALLOC_HEAP_GC_PRE];
}
else if (_PyType_IS_GC(tp)) {
m->current_object_heap = &m->heaps[_Py_MIMALLOC_HEAP_GC];
}
m->current_object_heap = _PyObject_GetAllocationHeap(tstate, tp);
#endif
void *mem = PyObject_Malloc(size);
#ifdef Py_GIL_DISABLED
Expand All @@ -44,12 +56,7 @@ _PyObject_ReallocWithType(PyTypeObject *tp, void *ptr, size_t size)
#ifdef Py_GIL_DISABLED
_PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
struct _mimalloc_thread_state *m = &tstate->mimalloc;
if (_PyType_HasFeature(tp, Py_TPFLAGS_PREHEADER)) {
m->current_object_heap = &m->heaps[_Py_MIMALLOC_HEAP_GC_PRE];
}
else if (_PyType_IS_GC(tp)) {
m->current_object_heap = &m->heaps[_Py_MIMALLOC_HEAP_GC];
}
m->current_object_heap = _PyObject_GetAllocationHeap(tstate, tp);
#endif
void *mem = PyObject_Realloc(ptr, size);
#ifdef Py_GIL_DISABLED
Expand Down