windows: first shot at naming threads with SetThreadDescription().

This is a bleeding edge API, added to Windows 10 Anniversary Edition (build
1607, specifically).

https://msdn.microsoft.com/en-us/library/windows/desktop/mt774976(v=vs.85).aspx

Nothing supports this yet, including WinDbg, Visual Studio, minidumps, etc,
so we still need to also use the RaiseException hack. But presumably tools
will use this API as a more robust and universal way to get thread names
sooner or later, so we'll start broadcasting to it now.
This commit is contained in:
Ryan C. Gordon 2017-01-27 20:50:30 -05:00
parent 95ab9dc73c
commit 8fa9b57f75

View File

@ -164,26 +164,53 @@ typedef struct tagTHREADNAME_INFO
} THREADNAME_INFO; } THREADNAME_INFO;
#pragma pack(pop) #pragma pack(pop)
typedef HRESULT (WINAPI *pfnSetThreadDescription)(HANDLE, PCWSTR);
void void
SDL_SYS_SetupThread(const char *name) SDL_SYS_SetupThread(const char *name)
{ {
if ((name != NULL) && IsDebuggerPresent()) { if (name != NULL) {
THREADNAME_INFO inf; static HMODULE kernel32 = 0;
static pfnSetThreadDescription pSetThreadDescription = NULL;
/* C# and friends will try to catch this Exception, let's avoid it. */ if (!kernel32) {
if (SDL_GetHintBoolean(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, SDL_FALSE)) { kernel32 = LoadLibrary(L"kernel32.dll");
return; if (kernel32) {
pSetThreadDescription = (pfnSetThreadDescription) GetProcAddress(kernel32, "SetThreadDescription");
}
} }
/* This magic tells the debugger to name a thread if it's listening. */ if (pSetThreadDescription != NULL) {
SDL_zero(inf); WCHAR *strw = WIN_UTF8ToString(name);
inf.dwType = 0x1000; if (strw) {
inf.szName = name; pSetThreadDescription(GetCurrentThread(), strw);
inf.dwThreadID = (DWORD) -1; SDL_free(strw);
inf.dwFlags = 0; }
}
/* The debugger catches this, renames the thread, continues on. */ /* Presumably some version of Visual Studio will understand SetThreadDescription(),
RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR*) &inf); but we still need to deal with older OSes and debuggers. Set it with the arcane
exception magic, too. */
if (IsDebuggerPresent()) {
THREADNAME_INFO inf;
/* C# and friends will try to catch this Exception, let's avoid it. */
if (SDL_GetHintBoolean(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, SDL_FALSE)) {
return;
}
/* This magic tells the debugger to name a thread if it's listening. */
SDL_zero(inf);
inf.dwType = 0x1000;
inf.szName = name;
inf.dwThreadID = (DWORD) -1;
inf.dwFlags = 0;
/* The debugger catches this, renames the thread, continues on. */
RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR*) &inf);
}
} }
} }