Address code review

Author: corona10

Include/internal/pycore_pymem.h

@@ -11,7 +11,8 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-#if defined(Py_DEBUG) && defined(HAVE_PR_SET_VMA_ANON_NAME)
+#if defined(Py_DEBUG) && defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
+#include <linux/prctl.h>
 #include <sys/prctl.h>
 #endif
 
@@ -96,9 +97,9 @@ static inline int _PyMem_IsULongFreed(unsigned long value)
 }
 
 static inline int
-_PyMem_Annotate_Mmap(void *addr, size_t size, const char *name)
+_PyAnnotateMemoryMap(void *addr, size_t size, const char *name)
 {
-#if defined(Py_DEBUG) && defined(HAVE_PR_SET_VMA_ANON_NAME)
+#if defined(Py_DEBUG) && defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
    prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, (unsigned long)addr, size, name);
    // Ignore errno from prctl
    // See: https://bugzilla.redhat.com/show_bug.cgi?id=2302746

Modules/_ctypes/malloc_closure.c

@@ -14,7 +14,7 @@
 #  endif
 #endif
 #include "ctypes.h"
-#include "pycore_obmalloc.h"      // _PyMem_Annotate_Mmap()
+#include "pycore_obmalloc.h"      // _PyAnnotateMemoryMap()
 
 /* BLOCKSIZE can be adjusted.  Larger blocksize will take a larger memory
    overhead, but allocate less blocks from the system.  It may be that some
@@ -84,7 +84,7 @@ static void more_core(void)
                         0);
     if (item == (void *)MAP_FAILED)
         return;
-    _PyMem_Annotate_Mmap(item, mem_size, "Python:more_core");
+    _PyAnnotateMemoryMap(item, mem_size, "Python:more_core");
 #endif
 
 #ifdef MALLOC_CLOSURE_DEBUG

Modules/mmapmodule.c

@@ -26,7 +26,7 @@
 #include "pycore_abstract.h"      // _Py_convert_optional_to_ssize_t()
 #include "pycore_bytesobject.h"   // _PyBytes_Find()
 #include "pycore_fileutils.h"     // _Py_stat_struct
-#include "pycore_obmalloc.h"      // _PyMem_Annotate_Mmap()
+#include "pycore_obmalloc.h"      // _PyAnnotateMemoryMap()
 #include "pycore_weakref.h"       // FT_CLEAR_WEAKREFS()
 
 #include <stddef.h>               // offsetof()
@@ -1952,7 +1952,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
-    _PyMem_Annotate_Mmap(m_obj->data, map_size, "Python:new_mmap_object");
+    _PyAnnotateMemoryMap(m_obj->data, map_size, "Python:new_mmap_object");
     m_obj->access = (access_mode)access;
     return (PyObject *)m_obj;
 }

Objects/obmalloc.c

@@ -467,7 +467,7 @@ _PyMem_ArenaAlloc(void *Py_UNUSED(ctx), size_t size)
     if (ptr == MAP_FAILED)
         return NULL;
     assert(ptr != NULL);
-    _PyMem_Annotate_Mmap(ptr, size, "Python:PyMem_ArenaAlloc");
+    _PyAnnotateMemoryMap(ptr, size, "Python:PyMem_ArenaAlloc");
     return ptr;
 #else
     return malloc(size);

Python/jit.c

@@ -72,7 +72,7 @@ jit_alloc(size_t size)
     unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0);
     int failed = memory == MAP_FAILED;
     if (!failed) {
-        _PyMem_Annotate_Mmap(memory, size, "Python:jit_alloc");
+        _PyAnnotateMemoryMap(memory, size, "Python:jit_alloc");
     }
 #endif
     if (failed) {

Python/perf_jit_trampoline.c

@@ -61,7 +61,7 @@
 #include "pycore_ceval.h"         // _PyPerf_Callbacks
 #include "pycore_frame.h"
 #include "pycore_interp.h"
-#include "pycore_obmalloc.h"      // _PyMem_Annotate_Mmap()
+#include "pycore_obmalloc.h"      // _PyAnnotateMemoryMap()
 #include "pycore_runtime.h"       // _PyRuntime
 
 #ifdef PY_HAVE_PERF_TRAMPOLINE
@@ -1086,7 +1086,7 @@ static void* perf_map_jit_init(void) {
         close(fd);
         return NULL;  // Memory mapping failed
     }
-    _PyMem_Annotate_Mmap(perf_jit_map_state.mapped_buffer, page_size, "Python:perf_map_jit_init");
+    _PyAnnotateMemoryMap(perf_jit_map_state.mapped_buffer, page_size, "Python:perf_map_jit_init");
 #endif
 
     perf_jit_map_state.mapped_size = page_size;

Python/perf_trampoline.c

@@ -132,7 +132,7 @@ any DWARF information available for them).
 #include "Python.h"
 #include "pycore_ceval.h"         // _PyPerf_Callbacks
 #include "pycore_interpframe.h"   // _PyFrame_GetCode()
-#include "pycore_obmalloc.h"      // _PyMem_Annotate_Mmap()
+#include "pycore_obmalloc.h"      // _PyAnnotateMemoryMap()
 #include "pycore_runtime.h"       // _PyRuntime
 
 
@@ -291,7 +291,7 @@ new_code_arena(void)
         perf_status = PERF_STATUS_FAILED;
         return -1;
     }
-    _PyMem_Annotate_Mmap(memory, mem_size, "Python:new_code_arena");
+    _PyAnnotateMemoryMap(memory, mem_size, "Python:new_code_arena");
     void *start = &_Py_trampoline_func_start;
     void *end = &_Py_trampoline_func_end;
     size_t code_size = end - start;