strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make optional use of SetThreadDescription in osl_setThreadName

Browse source 
... so that thread name could appear in crash dumps, and be
potentially available for logging on Windows 10 version 1607
and later.

Change-Id: I176ca1fce57e0532a226f85836b3889a8ffb2984
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116462
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2021-06-02 11:05:21 +02:00
parent f1be88688c
commit a5eba5fef0
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sal/osl/w32/thread.cxx
View file

@ -358,25 +358,43 @@ void SAL_CALL osl_yieldThread(void)
Sleep(0);
}
static void impSetThreadDescription(char const * name) {
// SetThreadDescription is only available since Windows 10 version 1607
typedef HRESULT(WINAPI * TSetThreadDescription)(HANDLE, PCWSTR);
static const auto pSetThreadDescription = reinterpret_cast<TSetThreadDescription>(
GetProcAddress(GetModuleHandleA("KernelBase.dll"), "SetThreadDescription"));
if (pSetThreadDescription)
{
if (const int nReqCCh = MultiByteToWideChar(CP_ACP, 0, name, -1, nullptr, 0))
{
if (PWSTR wStr = static_cast<PWSTR>(malloc(nReqCCh * sizeof(WCHAR))))
{
if (MultiByteToWideChar(CP_ACP, 0, name, -1, wStr, nReqCCh))
pSetThreadDescription(GetCurrentThread(), wStr);
free(wStr);
}
}
}
}
void SAL_CALL osl_setThreadName(char const * name) {
/* See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>: */
/* See < https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code >: */
#pragma pack(push, 8)
struct {
DWORD dwType;
DWORD dwType = 0x1000;
LPCSTR szName;
DWORD dwThreadID;
DWORD dwFlags;
DWORD dwThreadID = DWORD(-1);
DWORD dwFlags = 0;
} info;
#pragma pack(pop)
info.dwType = 0x1000;
info.szName = name;
info.dwThreadID = DWORD(-1);
info.dwFlags = 0;
__try {
RaiseException(
0x406D1388, 0, sizeof info / sizeof (ULONG_PTR),
reinterpret_cast<ULONG_PTR *>(&info));
} __except (EXCEPTION_EXECUTE_HANDLER) {}
impSetThreadDescription(name);
}
namespace {