[compiler-rt][Fuzzer] SetThreadName windows implementation new try. #76761
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: David CARLIER (devnexen) ChangesSetThreadDescription symbol needs to be dynamically loaded before usage. Then using a wide string buffer, since we re using a null terminated string, we can use MultiByteToWideChar -1 as 4th argument to finally set the thread name. Full diff: https://github.com/llvm/llvm-project/pull/76761.diff 1 Files Affected:
diff --git a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
index 71770166805f78..e47494060a0ff5 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
@@ -18,8 +18,10 @@
#include <errno.h>
#include <io.h>
#include <iomanip>
+#include <libloaderapi.h>
#include <signal.h>
#include <stdio.h>
+#include <stringapiset.h>
#include <sys/types.h>
#include <windows.h>
@@ -234,8 +236,19 @@ size_t PageSize() {
}
void SetThreadName(std::thread &thread, const std::string &name) {
- // TODO ?
- // to UTF-8 then SetThreadDescription ?
+ typedef HRESULT(WINAPI *proc)(HANDLE, PCWSTR);
+ HMODULE kbase = GetModuleHandleA("KernelBase.dll");
+ proc ThreadNameProc = reinterpret_cast<proc>(GetProcAddress, "SetThreadDescription");
+ if (proc) {
+ std::wstring buf;
+ auto sz = MultiByteToWideChar(CP_UTF8, 0, name.data(), -1, nullptr, 0);
+ if (sz > 0) {
+ buf.resize(sz);
+ if (MultyByteToWideChar(CP_UTF8, 0, name.data(), -1, &buf[0], sz) > 0) {
+ (void)ThreadNameProc(thread.native_handle(), buf.c_str());
+ }
+ }
+ }
}
} // namespace fuzzer
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
|
Can you please include into description # of the prev attempt? |
devnexen
force-pushed
the
windows_fuzzer_set_thread_name_newtry
branch
from
d99a0f9
to
9db1173
Compare
|
Note, PR github description, not commit, will be used, if PR is pushed web UI |
devnexen
force-pushed
the
windows_fuzzer_set_thread_name_newtry
branch
from
9db1173
to
b7f17aa
Compare
SetThreadDescription symbol needs to be dynamically loaded before usage. Then using a wide string buffer, since we re using a null terminated string, we can use MultiByteToWideChar -1 as 4th argument to finally set the thread name.
devnexen
force-pushed
the
windows_fuzzer_set_thread_name_newtry
branch
from
b7f17aa
to
5e6e63d
Compare
|
Can you please include into description the PR# pr commit of the previous attempt? |
I added revert patch into description. Just to help to see improvement vs prev version. |
vitalybuka
approved these changes
Mar 1, 2024
|
This interestingly broke our compiler-rt builds downstream: Interestingly, the contents of winnt.h around that line are: which suggests |
|
Then changing the order of the includes should solve it, windows.h before the new added entries ? |
|
After the include order change, it fails with: |
|
oh I see I ll revert and redo a PR, couple of typos here and there. |
devnexen
added a commit
to devnexen/llvm-project
that referenced
this pull request
Mar 1, 2024
…w try. (llvm#76761)" This reverts commit 2cdf611.
devnexen
added a commit
to devnexen/llvm-project
that referenced
this pull request
Mar 1, 2024
devnexen
added a commit
that referenced
this pull request
Mar 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SetThreadDescription symbol needs to be dynamically loaded before usage. Then using a wide string buffer, since we re using a null terminated string, we can use MultiByteToWideChar -1 as 4th argument to finally set the thread name.
Previously
SetThreadDescriptionwas called directly causing crash.It was reverted in dd3aa26