[Python-checkins] bpo-37087: Adding native ID support for OpenBSD (GH-13654)

Mon Jun 3 11:43:44 EDT 2019

https://github.com/python/cpython/commit/0b9956e9162d8723c2a30ff316ecc25e54459fb1
commit: 0b9956e9162d8723c2a30ff316ecc25e54459fb1
branch: master
author: David Carlier <dcarlier at afilias.info>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019年06月03日T17:43:33+02:00
summary:
bpo-37087: Adding native ID support for OpenBSD (GH-13654)
files:
A Misc/NEWS.d/next/Core and Builtins/2019-05-30-17-33-55.bpo-37087.vElenE.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 48d36e85c9e5..26568dcbf8f5 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.
+ .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD.
 
 .. versionadded:: 3.8
 
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index ffe6d04258aa..7fb9ac9979e4 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.
+ .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD.
 
 .. 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:: Windows, FreeBSD, Linux, macOS.
+ .. availability:: Require :func:`get_native_id` function.
 
 .. versionadded:: 3.8
 
diff --git a/Include/pythread.h b/Include/pythread.h
index c0f1eb9789b3..84b79c876425 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(_WIN32)
+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_WIN32)
 #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-30-17-33-55.bpo-37087.vElenE.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-30-17-33-55.bpo-37087.vElenE.rst
new file mode 100644
index 000000000000..a45330fed999
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-30-17-33-55.bpo-37087.vElenE.rst	
@@ -0,0 +1 @@
+Add native thread ID (TID) support to OpenBSD.
\ No newline at end of file
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index f57a1e7bb78b..740b521b9446 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -16,6 +16,8 @@
 # include <sys/syscall.h> /* syscall(SYS_gettid) */
 #elif defined(__FreeBSD__)
 # include <pthread_np.h> /* pthread_getthreadid_np() */
+#elif defined(__OpenBSD__)
+# include <unistd.h> /* getthrid() */
 #endif
 
 /* The POSIX spec requires that use of pthread_attr_setstacksize
@@ -323,6 +325,9 @@ PyThread_get_thread_native_id(void)
 #elif defined(__FreeBSD__)
 int native_id;
 native_id = pthread_getthreadid_np();
+#elif defined(__OpenBSD__)
+ pid_t native_id;
+ native_id = getthrid();
 #endif
 return (unsigned long) native_id;
 }
