gh-112529: Revert "Use _PyThread_Id() in mimalloc in free-threaded bu…

…ild" Reverts: #115488 Reason: Free-threaded Ubuntu buildbots are timing out
python · Feb 15, 2024 · c780e77 · c780e77
1 parent 298bcdc
commit c780e77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Include/internal/mimalloc/mimalloc/prim.h b/Include/internal/mimalloc/mimalloc/prim.h
@@ -131,13 +131,7 @@ extern bool _mi_process_is_initialized;             // has mi_process_init been
 
 static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept;
 
-#ifdef MI_PRIM_THREAD_ID
-
-static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept {
-  return MI_PRIM_THREAD_ID();
-}
-
-#elif defined(_WIN32)
+#if defined(_WIN32)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

diff --git a/Include/internal/pycore_mimalloc.h b/Include/internal/pycore_mimalloc.h
@@ -20,12 +20,9 @@ typedef enum {
 #include "pycore_pymem.h"
 
 #ifdef WITH_MIMALLOC
-#  ifdef Py_GIL_DISABLED
-#    define MI_PRIM_THREAD_ID   _Py_ThreadId
-#  endif
-#  define MI_DEBUG_UNINIT     PYMEM_CLEANBYTE
-#  define MI_DEBUG_FREED      PYMEM_DEADBYTE
-#  define MI_DEBUG_PADDING    PYMEM_FORBIDDENBYTE
+#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