mirror of
https://github.com/python/cpython.git
synced 2025-10-31 13:41:24 +00:00
acf3bcc886
* gh-112532: Use separate mimalloc heaps for GC objects In `--disable-gil` builds, we now use four separate heaps in anticipation of using mimalloc to find GC objects when the GIL is disabled. To support this, we also make a few changes to mimalloc: * `mi_heap_t` and `mi_tld_t` initialization is split from allocation. This allows us to have a `mi_tld_t` per-`PyThreadState`, which is important to keep interpreter isolation, since the same OS thread may run in multiple interpreters (using different PyThreadStates.) * Heap abandoning (mi_heap_collect_ex) can now be called from a different thread than the one that created the heap. This is necessary because we may clear and delete the containing PyThreadStates from a different thread during finalization and after fork(). * Use enum instead of defines and guard mimalloc includes. * The enum typedef will be convenient for future PRs that use the type. * Guarding the mimalloc includes allows us to unconditionally include pycore_mimalloc.h from other header files that rely on things like `struct _mimalloc_thread_state`. * Only define _mimalloc_thread_state in Py_GIL_DISABLED builds
45 lines
1.1 KiB
C
45 lines
1.1 KiB
C
#ifndef Py_INTERNAL_MIMALLOC_H
|
|
#define Py_INTERNAL_MIMALLOC_H
|
|
|
|
#ifndef Py_BUILD_CORE
|
|
# error "this header requires Py_BUILD_CORE define"
|
|
#endif
|
|
|
|
#if defined(MIMALLOC_H) || defined(MIMALLOC_TYPES_H)
|
|
# error "pycore_mimalloc.h must be included before mimalloc.h"
|
|
#endif
|
|
|
|
typedef enum {
|
|
_Py_MIMALLOC_HEAP_MEM = 0, // PyMem_Malloc() and friends
|
|
_Py_MIMALLOC_HEAP_OBJECT = 1, // non-GC objects
|
|
_Py_MIMALLOC_HEAP_GC = 2, // GC objects without pre-header
|
|
_Py_MIMALLOC_HEAP_GC_PRE = 3, // GC objects with pre-header
|
|
_Py_MIMALLOC_HEAP_COUNT
|
|
} _Py_mimalloc_heap_id;
|
|
|
|
#include "pycore_pymem.h"
|
|
|
|
#ifdef WITH_MIMALLOC
|
|
#define MI_DEBUG_UNINIT PYMEM_CLEANBYTE
|
|
#define MI_DEBUG_FREED PYMEM_DEADBYTE
|
|
#define MI_DEBUG_PADDING PYMEM_FORBIDDENBYTE
|
|
#ifdef Py_DEBUG
|
|
# define MI_DEBUG 1
|
|
#else
|
|
# define MI_DEBUG 0
|
|
#endif
|
|
|
|
#include "mimalloc.h"
|
|
#include "mimalloc/types.h"
|
|
#include "mimalloc/internal.h"
|
|
#endif
|
|
|
|
#ifdef Py_GIL_DISABLED
|
|
struct _mimalloc_thread_state {
|
|
mi_heap_t *current_object_heap;
|
|
mi_heap_t heaps[_Py_MIMALLOC_HEAP_COUNT];
|
|
mi_tld_t tld;
|
|
};
|
|
#endif
|
|
|
|
#endif // Py_INTERNAL_MIMALLOC_H
|