ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb: win32: set thread names

Browse source 
Use a new Windows 10 API, SetThreadDescription(). Background info from a Chrome developer:

https://randomascii.wordpress.com/2015/10/26/thread-naming-in-windows-time-for-something-better/

Test: Win10, Vista, adb shell
Test: Ran windbg -pn adb.exe, used .dump /ma to create a dump, ran
`dx -g @$curprocess.Threads' on the dump and it showed the thread names.

Change-Id: I14ea7121605cb3fa45ce7b59e2ba5882a215b59f
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
This commit is contained in:
Spencer Low 2018-09-03 16:03:22 -07:00
parent 640ceee567
commit 50beee3a2c
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/sysdeps.h
View file

@ -72,12 +72,7 @@ static __inline__ bool adb_is_separator(char c) {
return c == '\\' || c == '/';
}
static __inline__ int adb_thread_setname(const std::string& name) {
// TODO: See https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx for how to set
// the thread name in Windows. Unfortunately, it only works during debugging, but
// our build process doesn't generate PDB files needed for debugging.
return 0;
}
extern int adb_thread_setname(const std::string& name);
static __inline__ void close_on_exec(int fd)
{

23
adb/sysdeps_win32.cpp
View file

@ -2742,3 +2742,26 @@ char* adb_getcwd(char* buf, int size) {
return buf;
}
// The SetThreadDescription API was brought in version 1607 of Windows 10.
typedef HRESULT(WINAPI* SetThreadDescription)(HANDLE hThread, PCWSTR lpThreadDescription);
// Based on PlatformThread::SetName() from
// https://cs.chromium.org/chromium/src/base/threading/platform_thread_win.cc
int adb_thread_setname(const std::string& name) {
// The SetThreadDescription API works even if no debugger is attached.
auto set_thread_description_func = reinterpret_cast<SetThreadDescription>(
::GetProcAddress(::GetModuleHandleW(L"Kernel32.dll"), "SetThreadDescription"));
if (set_thread_description_func) {
std::wstring name_wide;
if (!android::base::UTF8ToWide(name.c_str(), &name_wide)) {
return errno;
}
set_thread_description_func(::GetCurrentThread(), name_wide.c_str());
}
// Don't use the thread naming SEH exception because we're compiled with -fno-exceptions.
// https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code?view=vs-2017
return 0;
}