seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #100400 from CrabNickolson/windows-thread-names

Browse Source 
Add support for thread naming on windows platform
This commit is contained in:
Thaddeus Crews
2024-12-19 19:59:41 -06:00
parent 0b2596a319 d848835f8c
commit 9300c2bdc9
3 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/windows/thread_windows.cpp Normal file
View File

@ -0,0 +1,59 @@
/**************************************************************************/
/* thread_windows.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifdef WINDOWS_ENABLED
#include "thread_windows.h"
#include "core/os/thread.h"
#include "core/string/ustring.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
typedef HRESULT(WINAPI *SetThreadDescriptionPtr)(HANDLE p_thread, PCWSTR p_thread_description);
SetThreadDescriptionPtr w10_SetThreadDescription = nullptr;
static Error set_name(const String &p_name) {
HANDLE hThread = GetCurrentThread();
HRESULT res = E_FAIL;
if (w10_SetThreadDescription) {
res = w10_SetThreadDescription(hThread, (LPCWSTR)p_name.utf16().get_data());
}
return SUCCEEDED(res) ? OK : ERR_INVALID_PARAMETER;
}
void init_thread_win() {
w10_SetThreadDescription = (SetThreadDescriptionPtr)(void *)GetProcAddress(LoadLibraryW(L"kernel32.dll"), "SetThreadDescription");
Thread::_set_platform_functions({ set_name });
}
#endif // WINDOWS_ENABLED

40
drivers/windows/thread_windows.h Normal file
View File

@ -0,0 +1,40 @@
/**************************************************************************/
/* thread_windows.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef THREAD_WINDOWS_H
#define THREAD_WINDOWS_H
#ifdef WINDOWS_ENABLED
void init_thread_win();
#endif // WINDOWS_ENABLED
#endif // THREAD_WINDOWS_H

5
platform/windows/os_windows.cpp
View File

@ -45,6 +45,7 @@
#include "drivers/windows/file_access_windows_pipe.h" #include "drivers/windows/file_access_windows_pipe.h"
#include "drivers/windows/ip_windows.h" #include "drivers/windows/ip_windows.h"
#include "drivers/windows/net_socket_winsock.h" #include "drivers/windows/net_socket_winsock.h"
#include "drivers/windows/thread_windows.h"
#include "main/main.h" #include "main/main.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/rendering/rendering_server_default.h" #include "servers/rendering/rendering_server_default.h"
@ -249,6 +250,10 @@ void OS_Windows::initialize() {
add_error_handler(&error_handlers); add_error_handler(&error_handlers);
#endif #endif
#ifdef THREADS_ENABLED
init_thread_win();
#endif
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_RESOURCES); FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_RESOURCES);
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_USERDATA); FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_USERDATA);
FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_FILESYSTEM); FileAccess::make_default<FileAccessWindows>(FileAccess::ACCESS_FILESYSTEM);