Changeset 237382 in webkit

Timestamp:

Oct 24, 2018 7:27:13 AM (6 years ago)

Author:

chris.reid@sony.com

Message:

[Win] Add function call name information to stack traces
​https://bugs.webkit.org/show_bug.cgi?id=190761

Reviewed by Fujii Hironori.

Add symbol information to stack traces using dbghelp.dll
This library will use symbols files from these sources:

• The current working directory
• The directory containing the application's executable
• _NT_SYMBOL_PATH environment variable
• _NT_ALTERNATE_SYMBOL_PATH environment variable

This functionality is currently only enabled in debug mode since dbghelp is not threadsafe.
The DbgHelper class attempts to synchronize calls to dbghelp.dll but external code
can still attempt to call the library at the same time as WebKit.

• wtf/CMakeLists.txt:
• wtf/PlatformWin.cmake:
• wtf/StackTrace.cpp:
• wtf/win/DbgHelperWin.cpp: Added.
• wtf/win/DbgHelperWin.h: Added.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/CMakeLists.txt (modified) (1 diff)
• wtf/PlatformWin.cmake (modified) (2 diffs)
• wtf/StackTrace.cpp (modified) (3 diffs)
• wtf/win/DbgHelperWin.cpp (added)
• wtf/win/DbgHelperWin.h (added)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-10-24  Christopher Reid  <chris.reid@sony.com>
+
+        [Win] Add function call name information to stack traces
+        https://bugs.webkit.org/show_bug.cgi?id=190761
+
+        Reviewed by Fujii Hironori.
+
+        Add symbol information to stack traces using dbghelp.dll
+        This library will use symbols files from these sources:
+            - The current working directory
+            - The directory containing the application's executable
+            - _NT_SYMBOL_PATH environment variable
+            - _NT_ALTERNATE_SYMBOL_PATH environment variable
+
+        This functionality is currently only enabled in debug mode since dbghelp is not threadsafe.
+        The DbgHelper class attempts to synchronize calls to dbghelp.dll but external code
+        can still attempt to call the library at the same time as WebKit.
+
+        * wtf/CMakeLists.txt:
+        * wtf/PlatformWin.cmake:
+        * wtf/StackTrace.cpp:
+        * wtf/win/DbgHelperWin.cpp: Added.
+        * wtf/win/DbgHelperWin.h: Added.
+
 2018-10-22  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -500 +500 @@
     )
     list(APPEND WTF_LIBRARIES
+        DbgHelp
         winmm
     )

trunk/Source/WTF/wtf/PlatformWin.cmake

@@ -2 +2 @@
     text/win/WCharStringExtras.h
 
+    win/DbgHelperWin.h
     win/GDIObject.h
     win/SoftLinking.h
@@ -11 +12 @@
 
     win/CPUTimeWin.cpp
+    win/DbgHelperWin.cpp
     win/LanguageWin.cpp
     win/MainThreadWin.cpp

trunk/Source/WTF/wtf/StackTrace.cpp

@@ -42 +42 @@
 #if OS(WINDOWS)
 #include <windows.h>
+#include <wtf/win/DbgHelperWin.h>
 #endif
 
@@ -111 +112 @@
     if (!symbols)
         return;
+#elif OS(WINDOWS)
+    HANDLE hProc = GetCurrentProcess();
+    uint8_t symbolData[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)] = { 0 };
+    auto symbolInfo = reinterpret_cast<SYMBOL_INFO*>(symbolData);
+
+    symbolInfo->SizeOfStruct = sizeof(SYMBOL_INFO);
+    symbolInfo->MaxNameLen = MAX_SYM_NAME;
 #endif
 
@@ -126 +134 @@
             cxaDemangled = demangled->demangledName();
         }
+#elif OS(WINDOWS)
+        if (DbgHelper::SymFromAddress(hProc, reinterpret_cast<DWORD64>(stack[i]), 0, symbolInfo))
+            mangledName = symbolInfo->Name;
 #endif
         const int frameNumber = i + 1;