8000 GH-110829: Ensure Thread.join() joins the OS thread by pitrou · Pull Request #110848 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-110829: Ensure Thread.join() joins the OS thread #110848

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
merged 19 commits into from
Nov 4, 2023
Merged

GH-110829: Ensure Thread.join() joins the OS thread #110848

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4074b59
GH-110829: Ensure Thread.join() joins the OS thread
pitrou Oct 13, 2023
27ae38b
Fix race condition in test_join_from_self
pitrou Oct 14, 2023
31bf2f3
Improve internal docs
pitrou Oct 14, 2023
192a741
Move API declarations to Include/cpython
pitrou Oct 14, 2023
e9c1e7a
Add required stub for pthread_join
pitrou Oct 14, 2023
70a6855
Mention that the new PyThread functions are uninterruptible.
pitrou Oct 16, 2023
d61fd5e
Add test for detaching from self
pitrou Oct 16, 2023
751675e
Fix race condition in Thread.join()
pitrou Oct 16, 2023
235544e
Make new PyThread APIs internal
pitrou Oct 27, 2023
1a58a24
Avoid closing invalid handle on Windows.
pitrou Oct 27, 2023
47809e8
Add test for Thread.join(timeout)
pitrou Oct 27, 2023
70d3e51
Switch to standalone start_joinable_thread() function and rich thread…
pitrou Oct 27, 2023
d14db26
Use `unsigned long long` for thread ids
pitrou Oct 27, 2023
99f3f52
Ensure fork safety
pitrou Oct 30, 2023
5a909ca
Safe casts on Windows
pitrou Oct 30, 2023
420ece6
Introduce PyThread_ident_t, PyThread_handle_t
pitrou Oct 30, 2023
96849d1
Address compiler warnings
pitrou Nov 4, 2023
5cf2684
Fix merge error
pitrou Nov 4, 2023
fa11244
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 4, 2023
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
Safe casts on Windows
  • Loading branch information
@pitrou
pitrou committed Nov 4, 2023
commit 5a909ca788fee6e951956a4666279bd24435ecc4
4 changes: 3 additions & 1 deletion Python/thread_nt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ PyThread_start_joinable_thread(void (*func)(void *), void *arg,
return -1;
}
*ident = threadID;
// The cast is safe since HANDLE is pointer-sized
*handle = (Py_uintptr_t) hThread;
return 0;
}
Expand All @@ -223,7 +224,8 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) {
return PYTHREAD_INVALID_THREAD_ID;
}
CloseHandle((HANDLE) handle);
return ident;
// The cast is safe since the ident is really an unsigned int
return (unsigned long) ident;
}

int
Expand Down
0