Fix thread handle leak on Windows #156854
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-platform-windows Author: Lukasz Mielicki (lmielick) ChangesContrary to pthread_join on Windows WaitForSingleObject does not destroy the thread handle. Add missing CloseHandle call to avoid a handle leak. Full diff: https://github.com/llvm/llvm-project/pull/156854.diff 1 Files Affected:
diff --git a/llvm/lib/Support/Windows/Threading.inc b/llvm/lib/Support/Windows/Threading.inc
index b11f216adeba4..fd872a2b133e9 100644
--- a/llvm/lib/Support/Windows/Threading.inc
+++ b/llvm/lib/Support/Windows/Threading.inc
@@ -42,6 +42,9 @@ void llvm_thread_join_impl(HANDLE hThread) {
if (::WaitForSingleObject(hThread, INFINITE) == WAIT_FAILED) {
ReportLastErrorFatal("WaitForSingleObject failed");
}
+ if (::CloseHandle(hThread) == FALSE) {
+ ReportLastErrorFatal("CloseHandle failed");
+ }
}
void llvm_thread_detach_impl(HANDLE hThread) {
|
|
@llvm/pr-subscribers-llvm-support Author: Lukasz Mielicki (lmielick) ChangesContrary to pthread_join on Windows WaitForSingleObject does not destroy the thread handle. Add missing CloseHandle call to avoid a handle leak. Full diff: https://github.com/llvm/llvm-project/pull/156854.diff 1 Files Affected:
diff --git a/llvm/lib/Support/Windows/Threading.inc b/llvm/lib/Support/Windows/Threading.inc
index b11f216adeba4..fd872a2b133e9 100644
--- a/llvm/lib/Support/Windows/Threading.inc
+++ b/llvm/lib/Support/Windows/Threading.inc
@@ -42,6 +42,9 @@ void llvm_thread_join_impl(HANDLE hThread) {
if (::WaitForSingleObject(hThread, INFINITE) == WAIT_FAILED) {
ReportLastErrorFatal("WaitForSingleObject failed");
}
+ if (::CloseHandle(hThread) == FALSE) {
+ ReportLastErrorFatal("CloseHandle failed");
+ }
}
void llvm_thread_detach_impl(HANDLE hThread) {
|
There was a problem hiding this comment.
LGTM - thread::join clears the handle after calling this, so we are definitely leaking at the moment:
llvm-project/llvm/include/llvm/Support/thread.h
Lines 144 to 147 in 8bdaa12
| @@ -42,6 +42,9 @@ void llvm_thread_join_impl(HANDLE hThread) { | |||
| if (::WaitForSingleObject(hThread, INFINITE) == WAIT_FAILED) { | |||
| ReportLastErrorFatal("WaitForSingleObject failed"); | |||
| } | |||
| if (::CloseHandle(hThread) == FALSE) { | |||
There was a problem hiding this comment.
nit: The brackets don't follow this LLVM coding standard guideline (but I know, it looks like the whole file is like that, and that should be corrected). I think we should stick to the guidelines to keep the codebase uniform.
Contrary to pthread_join on Windows WaitForSingleObject does not destroy the thread handle. Add missing CloseHandle call to avoid a handle leak.