From 9a1adf2790c156318158606ad83df9ce494f326a Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Wed, 18 May 2022 14:10:10 +0100 Subject: [PATCH] bpo-42047: Add native thread ID for DragonFlyBSD (#22714) Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: kj <28750310+Fidget-Spinner@users.noreply.github.com> Co-authored-by: Erlend Egeberg Aasland Co-authored-by: Victor Stinner --- Doc/library/_thread.rst | 2 +- Doc/library/threading.rst | 2 +- Include/pythread.h | 4 +++- .../next/Library/2020-10-15-18-37-12.bpo-42047.XDdoSF.rst | 1 + Python/thread_pthread.h | 5 +++++ 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2020-10-15-18-37-12.bpo-42047.XDdoSF.rst diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst index 1e6452b7b82..75b3834b9a3 100644 --- a/Doc/library/_thread.rst +++ b/Doc/library/_thread.rst @@ -118,7 +118,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, AIX. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX, DragonFlyBSD. .. versionadded:: 3.8 diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index b7775609616..0bc1f9d12a8 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -114,7 +114,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, AIX. + .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX, DragonFlyBSD. .. versionadded:: 3.8 diff --git a/Include/pythread.h b/Include/pythread.h index a48329085fa..63714437c49 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -20,7 +20,9 @@ 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) || defined(_AIX) +#if (defined(__APPLE__) || defined(__linux__) || defined(_WIN32) \ + || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ + || defined(__DragonFly__) || 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/Library/2020-10-15-18-37-12.bpo-42047.XDdoSF.rst b/Misc/NEWS.d/next/Library/2020-10-15-18-37-12.bpo-42047.XDdoSF.rst new file mode 100644 index 00000000000..4c23763cf8d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-15-18-37-12.bpo-42047.XDdoSF.rst @@ -0,0 +1 @@ +Add :func:`threading.get_native_id` support for DragonFly BSD. Patch by David Carlier. diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 2237018e9cb..1b2c28d0f39 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -23,6 +23,8 @@ # include /* thread_self() */ #elif defined(__NetBSD__) # include /* _lwp_self() */ +#elif defined(__DragonFly__) +# include /* lwp_gettid() */ #endif /* The POSIX spec requires that use of pthread_attr_setstacksize @@ -349,6 +351,9 @@ PyThread_get_thread_native_id(void) #elif defined(__NetBSD__) lwpid_t native_id; native_id = _lwp_self(); +#elif defined(__DragonFly__) + lwpid_t native_id; + native_id = lwp_gettid(); #endif return (unsigned long) native_id; }