From e834861ee5a85dc0b1e3ec5394bee9a846fe094e Mon Sep 17 00:00:00 2001 From: Michael Felt Date: Wed, 12 Jun 2019 14:29:48 +0000 Subject: [PATCH 1/2] Add native thread ID (TID) for AIX --- Doc/library/_thread.rst | 2 +- Doc/library/threading.rst | 4 ++-- Include/pythread.h | 2 +- .../2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst | 2 ++ Python/thread_pthread.h | 5 +++++ 5 files changed, 11 insertions(+), 4 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 26568dcbf8f532..ce84137f161897 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. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, AIX. .. versionadded:: 3.8 diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 7fb9ac9979e42f..131c1cbbb83365 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. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, AIX. .. versionadded:: 3.8 @@ -355,7 +355,7 @@ since it is impossible to detect the termination of alien threads. system-wide) from the time the thread is created until the thread has been terminated. - .. availability:: Require :func:`get_native_id` function. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, AIX. .. versionadded:: 3.8 diff --git a/Include/pythread.h b/Include/pythread.h index 84b79c87642575..3a4374ea5f37df 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(_WIN32) +#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || 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 00000000000000..6195871af85f64 --- /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 native thread ID (TID) for AIX +Patch by M. Felt diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 740b521b944621..32b303ae79f057 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -18,6 +18,8 @@ # include /* pthread_getthreadid_np() */ #elif defined(__OpenBSD__) # include /* getthrid() */ +#elif defined(_AIX) +# include /* thread_self() */ #endif /* The POSIX spec requires that use of pthread_attr_setstacksize @@ -328,6 +330,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(); #endif return (unsigned long) native_id; } From 5036c80a2a8ef4dba99018f15a8bd197e1d0f658 Mon Sep 17 00:00:00 2001 From: Michael Felt Date: Thu, 13 Jun 2019 19:45:26 +0000 Subject: [PATCH 2/2] update per peer review --- Doc/library/threading.rst | 2 +- .../Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 9ca617bf15d5d2..2907b65f5bca42 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -355,7 +355,7 @@ since it is impossible to detect the termination of alien threads. system-wide) from the time the thread is created until the thread has been terminated. - .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX. + .. availability:: Require :func:`get_native_id` function. .. versionadded:: 3.8 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 index 6195871af85f64..832dfc94ac49e2 100644 --- 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 @@ -1,2 +1,2 @@ -Add native thread ID (TID) for AIX +Add :func:`threading.get_native_id` support for AIX. Patch by M. Felt