Skip to content

Commit d848835

Browse files
CrabNickolsonCrabNickolson
committed
Add support for thread naming on windows platform
1 parent dc5f1b7 commit d848835

File tree

3 files changed

+104
-0
lines changed

3 files changed

+104
-0
lines changed

‎drivers/windows/thread_windows.cpp

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**************************************************************************/
2+
/* thread_windows.cpp */
3+
/**************************************************************************/
4+
/* This file is part of: */
5+
/* GODOT ENGINE */
6+
/* https://godotengine.org */
7+
/**************************************************************************/
8+
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
9+
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
10+
/* */
11+
/* Permission is hereby granted, free of charge, to any person obtaining */
12+
/* a copy of this software and associated documentation files (the */
13+
/* "Software"), to deal in the Software without restriction, including */
14+
/* without limitation the rights to use, copy, modify, merge, publish, */
15+
/* distribute, sublicense, and/or sell copies of the Software, and to */
16+
/* permit persons to whom the Software is furnished to do so, subject to */
17+
/* the following conditions: */
18+
/* */
19+
/* The above copyright notice and this permission notice shall be */
20+
/* included in all copies or substantial portions of the Software. */
21+
/* */
22+
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
23+
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
24+
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
25+
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
26+
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
27+
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
28+
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
29+
/**************************************************************************/
30+
31+
#ifdef WINDOWS_ENABLED
32+
33+
#include "thread_windows.h"
34+
35+
#include "core/os/thread.h"
36+
#include "core/string/ustring.h"
37+
38+
#define WIN32_LEAN_AND_MEAN
39+
#include <windows.h>
40+
41+
typedef HRESULT(WINAPI *SetThreadDescriptionPtr)(HANDLE p_thread, PCWSTR p_thread_description);
42+
SetThreadDescriptionPtr w10_SetThreadDescription = nullptr;
43+
44+
static Error set_name(const String &p_name) {
45+
HANDLE hThread = GetCurrentThread();
46+
HRESULT res = E_FAIL;
47+
if (w10_SetThreadDescription) {
48+
res = w10_SetThreadDescription(hThread, (LPCWSTR)p_name.utf16().get_data());
49+
}
50+
return SUCCEEDED(res) ? OK : ERR_INVALID_PARAMETER;
51+
}
52+
53+
void init_thread_win() {
54+
w10_SetThreadDescription = (SetThreadDescriptionPtr)(void *)GetProcAddress(LoadLibraryW(L"kernel32.dll"), "SetThreadDescription");
55+
56+
Thread::_set_platform_functions({ set_name });
57+
}
58+
59+
#endif // WINDOWS_ENABLED

‎drivers/windows/thread_windows.h

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**************************************************************************/
2+
/* thread_windows.h */
3+
/**************************************************************************/
4+
/* This file is part of: */
5+
/* GODOT ENGINE */
6+
/* https://godotengine.org */
7+
/**************************************************************************/
8+
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
9+
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
10+
/* */
11+
/* Permission is hereby granted, free of charge, to any person obtaining */
12+
/* a copy of this software and associated documentation files (the */
13+
/* "Software"), to deal in the Software without restriction, including */
14+
/* without limitation the rights to use, copy, modify, merge, publish, */
15+
/* distribute, sublicense, and/or sell copies of the Software, and to */
16+
/* permit persons to whom the Software is furnished to do so, subject to */
17+
/* the following conditions: */
18+
/* */
19+
/* The above copyright notice and this permission notice shall be */
20+
/* included in all copies or substantial portions of the Software. */
21+
/* */
22+
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
23+
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
24+
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
25+
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
26+
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
27+
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
28+
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
29+
/**************************************************************************/
30+
31+
#ifndef THREAD_WINDOWS_H
32+
#define THREAD_WINDOWS_H
33+
34+
#ifdef WINDOWS_ENABLED
35+
36+
void init_thread_win();
37+
38+
#endif // WINDOWS_ENABLED
39+
40+
#endif // THREAD_WINDOWS_H

‎platform/windows/os_windows.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "drivers/windows/file_access_windows_pipe.h"
4646
#include "drivers/windows/ip_windows.h"
4747
#include "drivers/windows/net_socket_winsock.h"
48+
#include "drivers/windows/thread_windows.h"
4849
#include "main/main.h"
4950
#include "servers/audio_server.h"
5051
#include "servers/rendering/rendering_server_default.h"
@@ -249,6 +250,10 @@ void OS_Windows::initialize() {
249250
add_error_handler(&error_handlers);
250251
#endif
251252

253+
#ifdef THREADS_ENABLED
254+
init_thread_win();
255+
#endif
256+
252257
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_RESOURCES);
253258
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_USERDATA);
254259
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_FILESYSTEM);

0 commit comments

Comments
 (0)