diff options
| author | Donghee Na <donghee.na@python.org> | 2023-12-18 16:54:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 16:54:49 (GMT) |
| commit | d00dbf541525fcb36c9c6ebb7b41a5637c5aa6c0 (patch) | |
| tree | 6f8d19d85f3cca55f6e913ddde727b83cd66fbfa | |
| parent | 59f0766ae5aef8bd393a53ab9234371b7d165ec3 (diff) | |
| download | cpython-d00dbf541525fcb36c9c6ebb7b41a5637c5aa6c0.zip cpython-d00dbf541525fcb36c9c6ebb7b41a5637c5aa6c0.tar.gz cpython-d00dbf541525fcb36c9c6ebb7b41a5637c5aa6c0.tar.bz2 | |
gh-112535: Implement fallback implementation of _Py_ThreadId() (gh-113185)
---------
Co-authored-by: Sam Gross <colesbury@gmail.com>
| -rw-r--r-- | Include/object.h | 6 | ||||
| -rw-r--r-- | Python/pystate.c | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/Include/object.h b/Include/object.h index d22e5c2..48f1ddf 100644 --- a/Include/object.h +++ b/Include/object.h @@ -239,6 +239,8 @@ PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y); #define Py_Is(x, y) ((x) == (y)) #if defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +PyAPI_FUNC(uintptr_t) _Py_GetThreadLocal_Addr(void); + static inline uintptr_t _Py_ThreadId(void) { @@ -291,7 +293,9 @@ _Py_ThreadId(void) __asm__ ("mv %0, tp" : "=r" (tid)); #endif #else - # error "define _Py_ThreadId for this platform" + // Fallback to a portable implementation if we do not have a faster + // platform-specific implementation. + tid = _Py_GetThreadLocal_Addr(); #endif return tid; } diff --git a/Python/pystate.c b/Python/pystate.c index e18eb01..632a119 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1951,6 +1951,20 @@ _PyThreadState_Bind(PyThreadState *tstate) } } +#if defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +uintptr_t +_Py_GetThreadLocal_Addr(void) +{ +#ifdef HAVE_THREAD_LOCAL + // gh-112535: Use the address of the thread-local PyThreadState variable as + // a unique identifier for the current thread. Each thread has a unique + // _Py_tss_tstate variable with a unique address. + return (uintptr_t)&_Py_tss_tstate; +#else +# error "no supported thread-local variable storage classifier" +#endif +} +#endif /***********************************/ /* routines for advanced debuggers */ |