Address code review

Author: corona10

Include/internal/pycore_pymem.h

@@ -100,12 +100,13 @@ static inline int
 _PyAnnotateMemoryMap(void *addr, size_t size, const char *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
-   errno = 0;
+    assert(strlen(name) < 80);
+    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
+    errno = 0;
 #endif
-   return 0;
+    return 0;
 }
 
 extern int _PyMem_GetAllocatorName(

Modules/_ctypes/malloc_closure.c

@@ -84,7 +84,7 @@ static void more_core(void)
                         0);
     if (item == (void *)MAP_FAILED)
         return;
-    _PyAnnotateMemoryMap(item, mem_size, "cpython:more_core");
+    _PyAnnotateMemoryMap(item, mem_size, "cpython:malloc_closure:more_core");
 #endif
 
 #ifdef MALLOC_CLOSURE_DEBUG

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:new_mmap_object");
+    _PyAnnotateMemoryMap(m_obj->data, map_size, "cpython:mmap: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);
-    _PyAnnotateMemoryMap(ptr, size, "cpython:PyMem_ArenaAlloc");
+    _PyAnnotateMemoryMap(ptr, size, "cpython:obmalloc: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) {
-        _PyAnnotateMemoryMap(memory, size, "cpython:jit_alloc");
+        _PyAnnotateMemoryMap(memory, size, "cpython:jit:jit_alloc");
     }
 #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_map_jit_init");
+    _PyAnnotateMemoryMap(perf_jit_map_state.mapped_buffer, page_size, "cpython:perf_jit_trampoline:perf_map_jit_init");
 #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:new_code_arena");
+    _PyAnnotateMemoryMap(memory, mem_size, "cpython:perf_trampoline:new_code_arena");
     void *start = &_Py_trampoline_func_start;
     void *end = &_Py_trampoline_func_end;
     size_t code_size = end - start;