From d0eeb936d8daf05d7d89f6935e3f4c0dee49c5be Mon Sep 17 00:00:00 2001 From: Michael Felt Date: Fri, 14 Jun 2019 00:34:46 +0200 Subject: bpo-37077: Add native thread ID (TID) for AIX (GH-13624) This is the followup for issue36084 https://bugs.python.org/issue37077 --- Doc/library/_thread.rst | 2 +- Doc/library/threading.rst | 2 +- Include/pythread.h | 2 +- .../Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst | 2 ++ Python/thread_pthread.h | 9 +++++++-- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst index 5b4fcde..bd653ab 100644 --- a/Doc/library/_thread.rst +++ b/Doc/library/_thread.rst @@ -106,7 +106,7 @@ This module defines the following constants and functions: Its value may be used to uniquely identify this particular thread system-wide (until the thread terminates, after which the value may be recycled by the OS). - .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX. .. versionadded:: 3.8 diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index b4f4814..2907b65 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -82,7 +82,7 @@ This module defines the following functions: Its value may be used to uniquely identify this particular thread system-wide (until the thread terminates, after which the value may be recycled by the OS). - .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX. .. versionadded:: 3.8 diff --git a/Include/pythread.h b/Include/pythread.h index 79a9210..f22e8c4 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -26,7 +26,7 @@ PyAPI_FUNC(unsigned long) PyThread_start_new_thread(void (*)(void *), void *); PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void); PyAPI_FUNC(unsigned long) PyThread_get_thread_ident(void); -#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(_WIN32) +#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(_WIN32) || defined(_AIX) #define PY_HAVE_THREAD_NATIVE_ID PyAPI_FUNC(unsigned long) PyThread_get_thread_native_id(void); #endif diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst new file mode 100644 index 0000000..832dfc9 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst @@ -0,0 +1,2 @@ +Add :func:`threading.get_native_id` support for AIX. +Patch by M. Felt diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 9b4b23b..a36d16c 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -18,8 +18,10 @@ # include /* pthread_getthreadid_np() */ #elif defined(__OpenBSD__) # include /* getthrid() */ -#elif defined(__NetBSD__) /* _lwp_self */ -# include +#elif defined(_AIX) +# include /* thread_self() */ +#elif defined(__NetBSD__) +# include /* _lwp_self() */ #endif /* The POSIX spec requires that use of pthread_attr_setstacksize @@ -330,6 +332,9 @@ PyThread_get_thread_native_id(void) #elif defined(__OpenBSD__) pid_t native_id; native_id = getthrid(); +#elif defined(_AIX) + tid_t native_id; + native_id = thread_self(); #elif defined(__NetBSD__) lwpid_t native_id; native_id = _lwp_self(); -- cgit v0.12