From d8ad9a702eee6f89c99c33843fab3ff930d47552 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 19 Aug 2022 21:41:25 +0200 Subject: [PATCH] gh-96125: Fix sys.thread_info.name on pthread platforms (GH-96126) Automerge-Triggered-By: GH:tiran (cherry picked from commit 822955c16654c22c10a993f5a94bbb68b857a150) Co-authored-by: Christian Heimes --- Lib/test/test_sys.py | 8 ++++++++ .../Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst | 2 ++ Python/thread.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index c513cf08a116d1..f87fcaa8f9e2e4 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -628,6 +628,14 @@ def test_thread_info(self): self.assertEqual(len(info), 3) self.assertIn(info.name, ('nt', 'pthread', 'pthread-stubs', 'solaris', None)) self.assertIn(info.lock, ('semaphore', 'mutex+cond', None)) + if sys.platform.startswith(("linux", "freebsd")): + self.assertEqual(info.name, "pthread") + elif sys.platform == "win32": + self.assertEqual(info.name, "nt") + elif sys.platform == "emscripten": + self.assertIn(info.name, {"pthread", "pthread-stubs"}) + elif sys.platform == "wasi": + self.assertEqual(info.name, "pthread-stubs") @unittest.skipUnless(support.is_emscripten, "only available on Emscripten") def test_emscripten_info(self): diff --git a/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst b/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst new file mode 100644 index 00000000000000..ba7d26a965821f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst @@ -0,0 +1,2 @@ +Fix incorrect condition that causes ``sys.thread_info.name`` to be wrong on +pthread platforms. diff --git a/Python/thread.c b/Python/thread.c index 08bcdda0483d79..940d8b8093ab53 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -97,7 +97,7 @@ _PyThread_debug_deprecation(void) # define PYTHREAD_NAME "pthread-stubs" # include "thread_pthread_stubs.h" #elif defined(_POSIX_THREADS) -# if defined(__EMSCRIPTEN__) || !defined(__EMSCRIPTEN_PTHREADS__) +# if defined(__EMSCRIPTEN__) && !defined(__EMSCRIPTEN_PTHREADS__) # define PYTHREAD_NAME "pthread-stubs" # else # define PYTHREAD_NAME "pthread"