[Python-checkins] bpo-37077: Add native thread ID (TID) for AIX (GH-13624)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/886d83e5aa8df2dd2e93421d2f614438a3244a1c
commit: 886d83e5aa8df2dd2e93421d2f614438a3244a1c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-06-13T15:54:04-07:00
summary:

bpo-37077: Add native thread ID (TID) for AIX (GH-13624)


This is the followup  for issue36084

https://bugs.python.org/issue37077
(cherry picked from commit d0eeb936d8daf05d7d89f6935e3f4c0dee49c5be)

Co-authored-by: Michael Felt <aixtools at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst
M Doc/library/_thread.rst
M Doc/library/threading.rst
M Include/pythread.h
M Python/thread_pthread.h

diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index 5b4fcde669e1..bd653ab32bb9 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 b4f4814c4ad3..2907b65f5bca 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 79a9210af3a4..f22e8c42c502 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 000000000000..832dfc94ac49
--- /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 9b4b23bdc7d7..a36d16c19ead 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -18,8 +18,10 @@
 #   include <pthread_np.h>      /* pthread_getthreadid_np() */
 #elif defined(__OpenBSD__)
 #   include <unistd.h>          /* getthrid() */
-#elif defined(__NetBSD__)       /* _lwp_self */
-#   include <lwp.h>
+#elif defined(_AIX)
+#   include <sys/thread.h>      /* thread_self() */
+#elif defined(__NetBSD__)
+#   include <lwp.h>             /* _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();