mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-23 09:54:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

winpthreads: also use SetThreadDescription to set thread name

Browse Source 
Using SetThreadDescription has the advantage that on recent Visual
Studio / Windows, the thread name is always available regardless of
whether a debugger was attached, is also available in crash dumps, and
to other tools.

Quoting MSDN at Set a thread name in C/C++:
https://learn.microsoft.com/en-us/visualstudio/debugger/tips-for-debugging-threads?view=vs-2022&tabs=csharp#set-a-thread-name-in-cc

> There are two ways to set a thread name. The first is via the
> SetThreadDescription function. The second is by throwing a
> particular exception while the Visual Studio debugger is attached to
> the process. Each approach has benefits and caveats. The use of
> SetThreadDescription is supported starting in Windows 10 version
> 1607 or Windows Server 2016.
>
> It's worth noting that both approaches can be used together, if
> desired, since the mechanisms by which they work are independent of
> each other.

Signed-off-by: Antonin Décimo <antonin@tarides.com>
Signed-off-by: LIU Hao <lh_mouse@126.com>
This commit is contained in:
Antonin Décimo 2024-10-21 13:26:23 +00:00 committed by LIU Hao
parent c3478beb29
commit 04ec40f5bc
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mingw-w64-libraries/winpthreads/src/misc.c
View File

@ -26,6 +26,7 @@
void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL; void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL;
static ULONGLONG (WINAPI *_pthread_get_tick_count_64) (VOID); static ULONGLONG (WINAPI *_pthread_get_tick_count_64) (VOID);
HRESULT (WINAPI *_pthread_set_thread_description) (HANDLE, PCWSTR) = NULL;
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
__attribute__((constructor(0))) __attribute__((constructor(0)))
@ -46,6 +47,13 @@ static void winpthreads_init(void)
if (!_pthread_get_system_time_best_as_file_time) if (!_pthread_get_system_time_best_as_file_time)
/* >15ms precision on Windows 10 */ /* >15ms precision on Windows 10 */
_pthread_get_system_time_best_as_file_time = GetSystemTimeAsFileTime; _pthread_get_system_time_best_as_file_time = GetSystemTimeAsFileTime;
mod = GetModuleHandleA("kernelbase.dll");
if (mod)
{
_pthread_set_thread_description =
(HRESULT (WINAPI *)(HANDLE, PCWSTR))(void*) GetProcAddress(mod, "SetThreadDescription");
}
} }
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)

1
mingw-w64-libraries/winpthreads/src/misc.h
View File

@ -108,6 +108,7 @@ unsigned long _pthread_wait_for_single_object (void *handle, unsigned long timeo
unsigned long _pthread_wait_for_multiple_objects (unsigned long count, void **handles, unsigned int all, unsigned long timeout); unsigned long _pthread_wait_for_multiple_objects (unsigned long count, void **handles, unsigned int all, unsigned long timeout);
extern void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME); extern void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME);
extern HRESULT (WINAPI *_pthread_set_thread_description) (HANDLE, PCWSTR);
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#define likely(cond) __builtin_expect((cond) != 0, 1) #define likely(cond) __builtin_expect((cond) != 0, 1)

15
mingw-w64-libraries/winpthreads/src/thread.c
View File

@ -1877,6 +1877,21 @@ pthread_setname_np (pthread_t thread, const char *name)
tv->thread_name = stored_name; tv->thread_name = stored_name;
SetThreadName (tv->tid, name); SetThreadName (tv->tid, name);
if (_pthread_set_thread_description != NULL)
{
size_t required_size = mbstowcs(NULL, name, 0);
if (required_size != (size_t)-1)
{
wchar_t *wname = malloc((required_size + 1) * sizeof(wchar_t));
if (wname != NULL)
{
mbstowcs(wname, name, required_size + 1);
_pthread_set_thread_description(tv->h, wname);
free(wname);
}
}
}
return 0; return 0;
} }