Move the object allocator definitions to pycore_obmalloc*.h.

python · ericsnowcurrently · Nov 11, 2022 · Oct 5, 2022 · Oct 6, 2022 · Oct 6, 2022
commit e5fc1394449dc1eed7c126d204817a2d14837367
@@ -407,8 +407,10 @@ on that C doesn't insert any padding anywhere in a pool_header at or before
 the prevpool member.
 **************************************************************************** */
 
+#define OBMALLOC_USED_POOLS_SIZE (2 * ((NB_SMALL_SIZE_CLASSES + 7) / 8) * 8)
+
 struct _obmalloc_pools {
-    poolp used[2 * ((NB_SMALL_SIZE_CLASSES + 7) / 8) * 8];
+    poolp used[OBMALLOC_USED_POOLS_SIZE];
 };
 
 
@@ -654,6 +656,12 @@ struct _obmalloc_state {
     struct _obmalloc_usage usage;
 };
 
+
+/* Allocate memory directly from the O/S virtual memory system,
+ * where supported. Otherwise fallback on malloc */
+void *_PyObject_VirtualAlloc(size_t size);
+void _PyObject_VirtualFree(void *, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

@@ -59,6 +59,84 @@ extern "C" {
     }
 
 
+/***************************************/
+/* the low-level object allocator implementation */
+
+#ifdef WITH_PYMALLOC
+#  ifdef MS_WINDOWS
+#    include <windows.h>
+#  elif defined(HAVE_MMAP)
+#    include <sys/mman.h>
+#    ifdef MAP_ANONYMOUS
+#      define ARENAS_USE_MMAP
+#    endif
+#  endif
+#endif
+
+#ifdef MS_WINDOWS
+static void *
+_PyObject_ArenaVirtualAlloc(void *Py_UNUSED(ctx), size_t size)
+{
+    return VirtualAlloc(NULL, size,
+                        MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+}
+
+static void
+_PyObject_ArenaVirtualFree(void *Py_UNUSED(ctx), void *ptr,
+    size_t Py_UNUSED(size))
+{
+    VirtualFree(ptr, 0, MEM_RELEASE);
+}
+
+#elif defined(ARENAS_USE_MMAP)
+static void *
+_PyObject_ArenaMmap(void *Py_UNUSED(ctx), size_t size)
+{
+    void *ptr;
+    ptr = mmap(NULL, size, PROT_READ|PROT_WRITE,
+               MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+    if (ptr == MAP_FAILED)
+        return NULL;
+    assert(ptr != NULL);
+    return ptr;
+}
+
+static void
+_PyObject_ArenaMunmap(void *Py_UNUSED(ctx), void *ptr, size_t size)
+{
+    munmap(ptr, size);
+}
+
+#else
+static void *
+_PyObject_ArenaMalloc(void *Py_UNUSED(ctx), size_t size)
+{
+    return malloc(size);
+}
+
+static void
+_PyObject_ArenaFree(void *Py_UNUSED(ctx), void *ptr, size_t Py_UNUSED(size))
+{
+    free(ptr);
+}
+#endif
+
+
+/**************************************/
+/* the object allocator's initializer */
+
+#ifdef MS_WINDOWS
+#  define _pymem_allocators_obj_arena_INIT \
+    { NULL, _PyObject_ArenaVirtualAlloc, _PyObject_ArenaVirtualFree }
+#elif defined(ARENAS_USE_MMAP)
+#  define _pymem_allocators_obj_arena_INIT \
+    { NULL, _PyObject_ArenaMmap, _PyObject_ArenaMunmap }
+#else
+#  define _pymem_allocators_obj_arena_INIT \
+    { NULL, _PyObject_ArenaMalloc, _PyObject_ArenaFree }
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif

@@ -115,11 +115,6 @@ struct _PyTraceMalloc_Config {
 
 PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config;
 
-/* Allocate memory directly from the O/S virtual memory system,
- * where supported. Otherwise fallback on malloc */
-void *_PyObject_VirtualAlloc(size_t size);
-void _PyObject_VirtualFree(void *, size_t size);
-
 /* This function returns the number of allocated memory blocks, regardless of size */
 PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void);
 

@@ -11,69 +11,6 @@ extern "C" {
 #include "pycore_allocators.h"
 
 
-/***************************************/
-/* the object allocator implementation */
-
-#ifdef WITH_PYMALLOC
-#  ifdef MS_WINDOWS
-#    include <windows.h>
-#  elif defined(HAVE_MMAP)
-#    include <sys/mman.h>
-#    ifdef MAP_ANONYMOUS
-#      define ARENAS_USE_MMAP
-#    endif
-#  endif
-#endif
-
-#ifdef MS_WINDOWS
-static void *
-_PyObject_ArenaVirtualAlloc(void *Py_UNUSED(ctx), size_t size)
-{
-    return VirtualAlloc(NULL, size,
-                        MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-}
-
-static void
-_PyObject_ArenaVirtualFree(void *Py_UNUSED(ctx), void *ptr,
-    size_t Py_UNUSED(size))
-{
-    VirtualFree(ptr, 0, MEM_RELEASE);
-}
-
-#elif defined(ARENAS_USE_MMAP)
-static void *
-_PyObject_ArenaMmap(void *Py_UNUSED(ctx), size_t size)
-{
-    void *ptr;
-    ptr = mmap(NULL, size, PROT_READ|PROT_WRITE,
-               MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-    if (ptr == MAP_FAILED)
-        return NULL;
-    assert(ptr != NULL);
-    return ptr;
-}
-
-static void
-_PyObject_ArenaMunmap(void *Py_UNUSED(ctx), void *ptr, size_t size)
-{
-    munmap(ptr, size);
-}
-
-#else
-static void *
-_PyObject_ArenaMalloc(void *Py_UNUSED(ctx), size_t size)
-{
-    return malloc(size);
-}
-
-static void
-_PyObject_ArenaFree(void *Py_UNUSED(ctx), void *ptr, size_t Py_UNUSED(size))
-{
-    free(ptr);
-}
-#endif
-
-
 /********************************/
 /* the allocators' initializers */
 
@@ -100,17 +37,6 @@ _PyObject_ArenaFree(void *Py_UNUSED(ctx), void *ptr, size_t Py_UNUSED(size))
        {'o', PYOBJ_ALLOC}, \
    }
 
-#ifdef MS_WINDOWS
-#  define _pymem_allocators_obj_arena_INIT \
-    { NULL, _PyObject_ArenaVirtualAlloc, _PyObject_ArenaVirtualFree }
-#elif defined(ARENAS_USE_MMAP)
-#  define _pymem_allocators_obj_arena_INIT \
-    { NULL, _PyObject_ArenaMmap, _PyObject_ArenaMunmap }
-#else
-#  define _pymem_allocators_obj_arena_INIT \
-    { NULL, _PyObject_ArenaMalloc, _PyObject_ArenaFree }
-#endif
-
 
 #ifdef __cplusplus
 }