OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 00:20:18 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Use the unicode variant of the Windows API (#47422) (#138605)

Browse Source 
Use the unicode variant of the Windows API in c10/util/Backtrace.cpp
- #47422

Pull Request resolved: https://github.com/pytorch/pytorch/pull/138605
Approved by: https://github.com/peterjc123, https://github.com/malfet
This commit is contained in:
Taras 2024-10-26 17:41:37 +00:00 committed by PyTorch MergeBot
parent 1a73255102
commit e78c4ded48
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
c10/util/Backtrace.cpp
View File

@ -11,6 +11,7 @@
#include <vector>
#ifdef _MSC_VER
#include <c10/util/Unicode.h>
#include <c10/util/win32-headers.h>
#include <iomanip>
#pragma comment(lib, "Dbghelp.lib")
@ -289,27 +290,31 @@ class GetBacktraceImpl {
#elif defined(_MSC_VER) // !SUPPORTS_BACKTRACE
const int max_name_len = 256;
std::string get_module_base_name(void* addr) {
std::wstring get_module_base_name(void* addr) {
HMODULE h_module;
char module[max_name_len];
strcpy(module, "");
GetModuleHandleEx(
wchar_t module[max_name_len];
wcscpy(module, L"");
GetModuleHandleExW(
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
(LPCTSTR)addr,
(LPCWSTR)addr,
&h_module);
if (h_module != NULL) {
GetModuleFileNameA(h_module, module, max_name_len);
GetModuleFileNameW(h_module, module, max_name_len);
}
char* last_slash_pos = strrchr(module, '\\');
wchar_t* last_slash_pos = wcsrchr(module, L'\\');
if (last_slash_pos) {
std::string module_base_name(last_slash_pos + 1);
std::wstring module_base_name(last_slash_pos + 1);
return module_base_name;
} else {
std::string module_base_name(module);
std::wstring module_base_name(module);
return module_base_name;
}
}
class SymbolHelper {
public:
static SymbolHelper& getInstance() {
@ -398,7 +403,8 @@ class GetBacktraceImpl {
}
// Get the module basename
std::string module = get_module_base_name(back_trace_[i_frame]);
std::string module =
c10::u16u8(get_module_base_name(back_trace_[i_frame]));
// The pattern on Windows is
// `<return-address> <symbol-address>