Skip to content

gh-130115: fix thread identifiers for 32-bit musl #130391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 11 commits into from
Apr 4, 2025
Merged

gh-130115: fix thread identifiers for 32-bit musl #130391

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51d6579
Return the main thread's short identifier on certain platforms
vfazio Feb 21, 2025
a9ca268
Add NEWS entry
vfazio Feb 21, 2025
f6ad25d
Merge branch 'main' into vfazio-thread_get_ident
vfazio Feb 21, 2025
b93868e
Merge remote-tracking branch 'upstream/main' into vfazio-thread_get_i…
vfazio Feb 23, 2025
7a4de5f
Move pthread_t to ident conversion to a shared function
vfazio Feb 23, 2025
af1233b
Reword NEWS entry
vfazio Feb 23, 2025
7bdfd34
Revert "Return the main thread's short identifier on certain platforms"
vfazio Feb 23, 2025
dc7c497
Merge remote-tracking branch 'upstream/main' into vfazio-thread_get_i…
vfazio Feb 23, 2025
140a4d8
simplify conversion logic
vfazio Apr 2, 2025
63812b5
Merge remote-tracking branch 'upstream/main' into vfazio-thread_get_i…
vfazio Apr 2, 2025
4ae6d7e
Merge branch 'main' into vfazio-thread_get_ident
vfazio Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Return the main thread's short identifier on certain platforms" 
This reverts commit 51d6579.
  • Loading branch information
@vfazio
vfazio committed Feb 23, 2025
commit 7bdfd34cdfc44eb8a8a3c1e799da43101af3f155
7 changes: 0 additions & 7 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,13 +2029,6 @@ An obsolete synonym of allocate_lock().");
static PyObject *
thread_get_ident(PyObject *self, PyObject *Py_UNUSED(ignored))
{
/* Work around an issue with the main thread ID to failing comparison checks
due to sign extension on some Linux libc implemenations. Can be removed
when thread identifiers are reworked. */
#if SIZEOF_LONG < SIZEOF_LONG_LONG && defined(__linux__) && !defined(__GLIBC__)
if (_Py_IsMainThread())
return PyLong_FromUnsignedLong(_PyRuntime.main_thread);
#endif
PyThread_ident_t ident = PyThread_get_thread_ident_ex();
if (ident == PYTHREAD_INVALID_THREAD_ID) {
PyErr_SetString(ThreadError, "no current thread ident");
Expand Down