diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-12 16:03:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 16:03:04 (GMT) |
| commit | c9ca96dd968176580a011e852066c95a48aab7e0 (patch) | |
| tree | 4a4388e7de6898df38c46f3ca4a8a96caa8545e1 | |
| parent | b2fd32b2f041402bb9fc8607f01566c055aafed9 (diff) | |
| download | cpython-c9ca96dd968176580a011e852066c95a48aab7e0.zip cpython-c9ca96dd968176580a011e852066c95a48aab7e0.tar.gz cpython-c9ca96dd968176580a011e852066c95a48aab7e0.tar.bz2 | |
bpo-37160: Thread native ID NetBSD support (GH-13835)
(cherry picked from commit 5287022eeeb3c017d49fc8580b52e18377bf23f3)
Co-authored-by: David Carlier <dcarlier@afilias.info>
| -rw-r--r-- | Doc/library/_thread.rst | 2 | ||||
| -rw-r--r-- | Doc/library/threading.rst | 2 | ||||
| -rw-r--r-- | Include/pythread.h | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160.O3IAY3.rst | 1 | ||||
| -rw-r--r-- | Python/thread_pthread.h | 5 |
5 files changed, 9 insertions, 3 deletions
diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst index 26568dc..5b4fcde 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, NetBSD. .. versionadded:: 3.8 diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 7fb9ac9..b4f4814 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, NetBSD. .. versionadded:: 3.8 diff --git a/Include/pythread.h b/Include/pythread.h index 84b79c8..79a9210 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(__NetBSD__) || 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-06-05-09-24-17.bpo-37160.O3IAY3.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160.O3IAY3.rst new file mode 100644 index 0000000..c2fc680 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160.O3IAY3.rst @@ -0,0 +1 @@ +:func:`threading.get_native_id` now also supports NetBSD.
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 740b521..9b4b23b 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -18,6 +18,8 @@ # include <pthread_np.h> /* pthread_getthreadid_np() */ #elif defined(__OpenBSD__) # include <unistd.h> /* getthrid() */ +#elif defined(__NetBSD__) /* _lwp_self */ +# include <lwp.h> #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(__NetBSD__) + lwpid_t native_id; + native_id = _lwp_self(); #endif return (unsigned long) native_id; } |