Apply suggestions from code review

Co-authored-by: Victor Stinner <vstinner@python.org>

Author: corona10

Include/internal/pycore_pymem.h

@@ -12,8 +12,8 @@ extern "C" {
 #endif
 
 #if defined(Py_DEBUG) && defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
-#include <linux/prctl.h>
-#include <sys/prctl.h>
+#  include <linux/prctl.h>
+#  include <sys/prctl.h>
 #endif
 
 // Try to get the allocators name set by _PyMem_SetupAllocators().

Modules/mmapmodule.c

@@ -1952,7 +1952,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
-    _PyAnnotateMemoryMap(m_obj->data, map_size, "cpython:mmap:new_mmap_object");
+    _PyAnnotateMemoryMap(m_obj->data, map_size, "cpython:mmap");
     m_obj->access = (access_mode)access;
     return (PyObject *)m_obj;
 }

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) {
-        _PyAnnotateMemoryMap(memory, size, "cpython:jit:jit_alloc");
+        _PyAnnotateMemoryMap(memory, size, "cpython:jit");
     }
 #endif
     if (failed) {

Python/perf_jit_trampoline.c

@@ -1086,7 +1086,7 @@ static void* perf_map_jit_init(void) {
         close(fd);
         return NULL;  // Memory mapping failed
     }
-    _PyAnnotateMemoryMap(perf_jit_map_state.mapped_buffer, page_size, "cpython:perf_jit_trampoline:perf_map_jit_init");
+    _PyAnnotateMemoryMap(perf_jit_map_state.mapped_buffer, page_size, "cpython:perf_jit_trampoline");
 #endif
 
     perf_jit_map_state.mapped_size = page_size;

Python/perf_trampoline.c

@@ -291,7 +291,7 @@ new_code_arena(void)
         perf_status = PERF_STATUS_FAILED;
         return -1;
     }
-    _PyAnnotateMemoryMap(memory, mem_size, "cpython:perf_trampoline:new_code_arena");
+    _PyAnnotateMemoryMap(memory, mem_size, "cpython:perf_trampoline");
     void *start = &_Py_trampoline_func_start;
     void *end = &_Py_trampoline_func_end;
     size_t code_size = end - start;