Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c780e77

Browse filesBrowse files
committed
gh-112529: Revert "Use _PyThread_Id() in mimalloc in free-threaded build"
Reverts: #115488 Reason: Free-threaded Ubuntu buildbots are timing out
1 parent 298bcdc commit c780e77
Copy full SHA for c780e77

File tree

Expand file treeCollapse file tree

2 files changed

+4
-13
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+4
-13
lines changed

‎Include/internal/mimalloc/mimalloc/prim.h

Copy file name to clipboardExpand all lines: Include/internal/mimalloc/mimalloc/prim.h
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,7 @@ extern bool _mi_process_is_initialized; // has mi_process_init been
131131

132132
static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept;
133133

134-
#ifdef MI_PRIM_THREAD_ID
135-
136-
static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept {
137-
return MI_PRIM_THREAD_ID();
138-
}
139-
140-
#elif defined(_WIN32)
134+
#if defined(_WIN32)
141135

142136
#define WIN32_LEAN_AND_MEAN
143137
#include <windows.h>

‎Include/internal/pycore_mimalloc.h

Copy file name to clipboardExpand all lines: Include/internal/pycore_mimalloc.h
+3-6Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ typedef enum {
2020
#include "pycore_pymem.h"
2121

2222
#ifdef WITH_MIMALLOC
23-
# ifdef Py_GIL_DISABLED
24-
# define MI_PRIM_THREAD_ID _Py_ThreadId
25-
# endif
26-
# define MI_DEBUG_UNINIT PYMEM_CLEANBYTE
27-
# define MI_DEBUG_FREED PYMEM_DEADBYTE
28-
# define MI_DEBUG_PADDING PYMEM_FORBIDDENBYTE
23+
#define MI_DEBUG_UNINIT PYMEM_CLEANBYTE
24+
#define MI_DEBUG_FREED PYMEM_DEADBYTE
25+
#define MI_DEBUG_PADDING PYMEM_FORBIDDENBYTE
2926
#ifdef Py_DEBUG
3027
# define MI_DEBUG 1
3128
#else

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.