<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Done in r231562.<div class=""><br class=""></div><div class="">Kuba</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Mar 7, 2015, at 1:36 AM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com" class="">vonosmas@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Please add sanitizer_symbolizer_win.h to SANITIZER_HEADERS in CMakeLists.txt</div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Fri, Mar 6, 2015 at 6:33 AM, Kuba Brecka <span dir="ltr" class=""><<a href="mailto:kuba.brecka@gmail.com" target="_blank" class="">kuba.brecka@gmail.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kuba.brecka<br class="">
Date: Fri Mar 6 08:33:56 2015<br class="">
New Revision: 231478<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=231478&view=rev" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=231478&view=rev</a><br class="">
Log:<br class="">
Symbolizer refactoring: Make WinSymbolizer use SymbolizerTool interface<br class="">
<br class="">
Reviewed at <a href="http://reviews.llvm.org/D8089" target="_blank" class="">http://reviews.llvm.org/D8089</a><br class="">
<br class="">
<br class="">
Added:<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h<br class="">
Modified:<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br class="">
compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h?rev=231478&r1=231477&r2=231478&view=diff" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h?rev=231478&r1=231477&r2=231478&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_internal.h Fri Mar 6 08:33:56 2015<br class="">
@@ -26,6 +26,9 @@ const char *ExtractToken(const char *str<br class="">
const char *ExtractInt(const char *str, const char *delims, int *result);<br class="">
const char *ExtractUptr(const char *str, const char *delims, uptr *result);<br class="">
<br class="">
+// SymbolizerTool is an interface that is implemented by individual "tools"<br class="">
+// that can perform symbolication (external llvm-symbolizer, libbacktrace,<br class="">
+// Windows DbgHelp symbolizer, etc.).<br class="">
class SymbolizerTool {<br class="">
public:<br class="">
// POSIXSymbolizer implements a "fallback chain" of symbolizer tools. In a<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc?rev=231478&r1=231477&r2=231478&view=diff" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc?rev=231478&r1=231477&r2=231478&view=diff</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc (original)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc Fri Mar 6 08:33:56 2015<br class="">
@@ -18,139 +18,171 @@<br class="">
#include <dbghelp.h><br class="">
#pragma comment(lib, "dbghelp.lib")<br class="">
<br class="">
-#include "sanitizer_symbolizer.h"<br class="">
+#include "sanitizer_symbolizer_win.h"<br class="">
+#include "sanitizer_symbolizer_internal.h"<br class="">
<br class="">
namespace __sanitizer {<br class="">
<br class="">
-class WinSymbolizer : public Symbolizer {<br class="">
- public:<br class="">
- WinSymbolizer() : initialized_(false) {}<br class="">
+namespace {<br class="">
<br class="">
- SymbolizedStack *SymbolizePC(uptr addr) override {<br class="">
- SymbolizedStack *frame = SymbolizedStack::New(addr);<br class="">
+bool is_dbghelp_initialized = false;<br class="">
<br class="">
- BlockingMutexLock l(&dbghelp_mu_);<br class="">
- InitializeIfNeeded();<br class="">
+bool TrySymInitialize() {<br class="">
+ SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES);<br class="">
+ return SymInitialize(GetCurrentProcess(), 0, TRUE);<br class="">
+ // FIXME: We don't call SymCleanup() on exit yet - should we?<br class="">
+}<br class="">
<br class="">
- // See <a href="http://msdn.microsoft.com/en-us/library/ms680578(VS.85).aspx" target="_blank" class="">http://msdn.microsoft.com/en-us/library/ms680578(VS.85).aspx</a><br class="">
- char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(CHAR)];<br class="">
- PSYMBOL_INFO symbol = (PSYMBOL_INFO)buffer;<br class="">
- symbol->SizeOfStruct = sizeof(SYMBOL_INFO);<br class="">
- symbol->MaxNameLen = MAX_SYM_NAME;<br class="">
- DWORD64 offset = 0;<br class="">
- BOOL got_objname = SymFromAddr(GetCurrentProcess(),<br class="">
- (DWORD64)addr, &offset, symbol);<br class="">
- if (!got_objname)<br class="">
- return frame;<br class="">
-<br class="">
- DWORD unused;<br class="">
- IMAGEHLP_LINE64 line_info;<br class="">
- line_info.SizeOfStruct = sizeof(IMAGEHLP_LINE64);<br class="">
- BOOL got_fileline = SymGetLineFromAddr64(GetCurrentProcess(), (DWORD64)addr,<br class="">
- &unused, &line_info);<br class="">
- frame->info.function = internal_strdup(symbol->Name);<br class="">
- frame->info.function_offset = (uptr)offset;<br class="">
- if (got_fileline) {<br class="">
- frame->info.file = internal_strdup(line_info.FileName);<br class="">
- frame->info.line = line_info.LineNumber;<br class="">
- }<br class="">
-<br class="">
- IMAGEHLP_MODULE64 mod_info;<br class="">
- internal_memset(&mod_info, 0, sizeof(mod_info));<br class="">
- mod_info.SizeOfStruct = sizeof(mod_info);<br class="">
- if (SymGetModuleInfo64(GetCurrentProcess(), addr, &mod_info))<br class="">
- frame->info.FillModuleInfo(mod_info.ImageName,<br class="">
- addr - (uptr)mod_info.BaseOfImage);<br class="">
- return frame;<br class="">
+// Initializes DbgHelp library, if it's not yet initialized. Calls to this<br class="">
+// function should be synchronized with respect to other calls to DbgHelp API<br class="">
+// (e.g. from WinSymbolizerTool).<br class="">
+void InitializeDbgHelpIfNeeded() {<br class="">
+ if (is_dbghelp_initialized)<br class="">
+ return;<br class="">
+ if (!TrySymInitialize()) {<br class="">
+ // OK, maybe the client app has called SymInitialize already.<br class="">
+ // That's a bit unfortunate for us as all the DbgHelp functions are<br class="">
+ // single-threaded and we can't coordinate with the app.<br class="">
+ // FIXME: Can we stop the other threads at this point?<br class="">
+ // Anyways, we have to reconfigure stuff to make sure that SymInitialize<br class="">
+ // has all the appropriate options set.<br class="">
+ // Cross our fingers and reinitialize DbgHelp.<br class="">
+ Report("*** WARNING: Failed to initialize DbgHelp! ***\n");<br class="">
+ Report("*** Most likely this means that the app is already ***\n");<br class="">
+ Report("*** using DbgHelp, possibly with incompatible flags. ***\n");<br class="">
+ Report("*** Due to technical reasons, symbolization might crash ***\n");<br class="">
+ Report("*** or produce wrong results. ***\n");<br class="">
+ SymCleanup(GetCurrentProcess());<br class="">
+ TrySymInitialize();<br class="">
}<br class="">
+ is_dbghelp_initialized = true;<br class="">
<br class="">
- bool CanReturnFileLineInfo() override {<br class="">
+ // When an executable is run from a location different from the one where it<br class="">
+ // was originally built, we may not see the nearby PDB files.<br class="">
+ // To work around this, let's append the directory of the main module<br class="">
+ // to the symbol search path. All the failures below are not fatal.<br class="">
+ const size_t kSymPathSize = 2048;<br class="">
+ static wchar_t path_buffer[kSymPathSize + 1 + MAX_PATH];<br class="">
+ if (!SymGetSearchPathW(GetCurrentProcess(), path_buffer, kSymPathSize)) {<br class="">
+ Report("*** WARNING: Failed to SymGetSearchPathW ***\n");<br class="">
+ return;<br class="">
+ }<br class="">
+ size_t sz = wcslen(path_buffer);<br class="">
+ if (sz) {<br class="">
+ CHECK_EQ(0, wcscat_s(path_buffer, L";"));<br class="">
+ sz++;<br class="">
+ }<br class="">
+ DWORD res = GetModuleFileNameW(NULL, path_buffer + sz, MAX_PATH);<br class="">
+ if (res == 0 || res == MAX_PATH) {<br class="">
+ Report("*** WARNING: Failed to getting the EXE directory ***\n");<br class="">
+ return;<br class="">
+ }<br class="">
+ // Write the zero character in place of the last backslash to get the<br class="">
+ // directory of the main module at the end of path_buffer.<br class="">
+ wchar_t *last_bslash = wcsrchr(path_buffer + sz, L'<a href="smb://'" class="">\\'</a>);<br class="">
+ CHECK_NE(last_bslash, 0);<br class="">
+ *last_bslash = L'\0';<br class="">
+ if (!SymSetSearchPathW(GetCurrentProcess(), path_buffer)) {<br class="">
+ Report("*** WARNING: Failed to SymSetSearchPathW\n");<br class="">
+ return;<br class="">
+ }<br class="">
+}<br class="">
+<br class="">
+} // namespace<br class="">
+<br class="">
+bool WinSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *frame) {<br class="">
+ InitializeDbgHelpIfNeeded();<br class="">
+<br class="">
+ // See <a href="http://msdn.microsoft.com/en-us/library/ms680578(VS.85).aspx" target="_blank" class="">http://msdn.microsoft.com/en-us/library/ms680578(VS.85).aspx</a><br class="">
+ char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(CHAR)];<br class="">
+ PSYMBOL_INFO symbol = (PSYMBOL_INFO)buffer;<br class="">
+ symbol->SizeOfStruct = sizeof(SYMBOL_INFO);<br class="">
+ symbol->MaxNameLen = MAX_SYM_NAME;<br class="">
+ DWORD64 offset = 0;<br class="">
+ BOOL got_objname = SymFromAddr(GetCurrentProcess(),<br class="">
+ (DWORD64)addr, &offset, symbol);<br class="">
+ if (!got_objname)<br class="">
+ return false;<br class="">
+<br class="">
+ DWORD unused;<br class="">
+ IMAGEHLP_LINE64 line_info;<br class="">
+ line_info.SizeOfStruct = sizeof(IMAGEHLP_LINE64);<br class="">
+ BOOL got_fileline = SymGetLineFromAddr64(GetCurrentProcess(), (DWORD64)addr,<br class="">
+ &unused, &line_info);<br class="">
+ frame->info.function = internal_strdup(symbol->Name);<br class="">
+ frame->info.function_offset = (uptr)offset;<br class="">
+ if (got_fileline) {<br class="">
+ frame->info.file = internal_strdup(line_info.FileName);<br class="">
+ frame->info.line = line_info.LineNumber;<br class="">
+ }<br class="">
+ return true;<br class="">
+}<br class="">
+<br class="">
+const char *WinSymbolizerTool::Demangle(const char *name) {<br class="">
+ CHECK(is_dbghelp_initialized);<br class="">
+ static char demangle_buffer[1000];<br class="">
+ if (name[0] == '\01' &&<br class="">
+ UnDecorateSymbolName(name + 1, demangle_buffer, sizeof(demangle_buffer),<br class="">
+ UNDNAME_NAME_ONLY))<br class="">
+ return demangle_buffer;<br class="">
+ else<br class="">
+ return name;<br class="">
+}<br class="">
+<br class="">
+bool FindModuleNameAndOffsetForAddress(uptr addr, const char **module_name,<br class="">
+ uptr *module_offset) {<br class="">
+ InitializeDbgHelpIfNeeded();<br class="">
+<br class="">
+ IMAGEHLP_MODULE64 mod_info;<br class="">
+ internal_memset(&mod_info, 0, sizeof(mod_info));<br class="">
+ mod_info.SizeOfStruct = sizeof(mod_info);<br class="">
+ if (SymGetModuleInfo64(GetCurrentProcess(), addr, &mod_info)) {<br class="">
+ *module_name = mod_info.ImageName;<br class="">
+ *module_offset = addr - (uptr)mod_info.BaseOfImage;<br class="">
return true;<br class="">
}<br class="">
+ return false;<br class="">
+}<br class="">
<br class="">
+// TODO(kuba.brecka): To be merged with POSIXSymbolizer.<br class="">
+class WinSymbolizer : public Symbolizer {<br class="">
+ public:<br class="">
+ explicit WinSymbolizer(SymbolizerTool *tool) : Symbolizer(), tool_(tool) {<br class="">
+ CHECK(tool);<br class="">
+ }<br class="">
+ SymbolizedStack *SymbolizePC(uptr addr) override {<br class="">
+ BlockingMutexLock l(&mu_);<br class="">
+ const char *module_name;<br class="">
+ uptr module_offset;<br class="">
+ SymbolizedStack *res = SymbolizedStack::New(addr);<br class="">
+ if (FindModuleNameAndOffsetForAddress(addr, &module_name, &module_offset))<br class="">
+ res->info.FillModuleInfo(module_name, module_offset);<br class="">
+ tool_->SymbolizePC(addr, res);<br class="">
+ return res;<br class="">
+ }<br class="">
+ bool CanReturnFileLineInfo() override {<br class="">
+ return true;<br class="">
+ }<br class="">
const char *Demangle(const char *name) override {<br class="">
- CHECK(initialized_);<br class="">
- static char demangle_buffer[1000];<br class="">
- if (name[0] == '\01' &&<br class="">
- UnDecorateSymbolName(name + 1, demangle_buffer, sizeof(demangle_buffer),<br class="">
- UNDNAME_NAME_ONLY))<br class="">
- return demangle_buffer;<br class="">
- else<br class="">
- return name;<br class="">
- }<br class="">
-<br class="">
- // FIXME: Implement GetModuleNameAndOffsetForPC().<br class="">
-<br class="">
- private:<br class="">
- void InitializeIfNeeded() {<br class="">
- if (initialized_)<br class="">
- return;<br class="">
- if (!TrySymInitialize()) {<br class="">
- // OK, maybe the client app has called SymInitialize already.<br class="">
- // That's a bit unfortunate for us as all the DbgHelp functions are<br class="">
- // single-threaded and we can't coordinate with the app.<br class="">
- // FIXME: Can we stop the other threads at this point?<br class="">
- // Anyways, we have to reconfigure stuff to make sure that SymInitialize<br class="">
- // has all the appropriate options set.<br class="">
- // Cross our fingers and reinitialize DbgHelp.<br class="">
- Report("*** WARNING: Failed to initialize DbgHelp! ***\n");<br class="">
- Report("*** Most likely this means that the app is already ***\n");<br class="">
- Report("*** using DbgHelp, possibly with incompatible flags. ***\n");<br class="">
- Report("*** Due to technical reasons, symbolization might crash ***\n");<br class="">
- Report("*** or produce wrong results. ***\n");<br class="">
- SymCleanup(GetCurrentProcess());<br class="">
- TrySymInitialize();<br class="">
- }<br class="">
- initialized_ = true;<br class="">
-<br class="">
- // When an executable is run from a location different from the one where it<br class="">
- // was originally built, we may not see the nearby PDB files.<br class="">
- // To work around this, let's append the directory of the main module<br class="">
- // to the symbol search path. All the failures below are not fatal.<br class="">
- const size_t kSymPathSize = 2048;<br class="">
- static wchar_t path_buffer[kSymPathSize + 1 + MAX_PATH];<br class="">
- if (!SymGetSearchPathW(GetCurrentProcess(), path_buffer, kSymPathSize)) {<br class="">
- Report("*** WARNING: Failed to SymGetSearchPathW ***\n");<br class="">
- return;<br class="">
- }<br class="">
- size_t sz = wcslen(path_buffer);<br class="">
- if (sz) {<br class="">
- CHECK_EQ(0, wcscat_s(path_buffer, L";"));<br class="">
- sz++;<br class="">
- }<br class="">
- DWORD res = GetModuleFileNameW(NULL, path_buffer + sz, MAX_PATH);<br class="">
- if (res == 0 || res == MAX_PATH) {<br class="">
- Report("*** WARNING: Failed to getting the EXE directory ***\n");<br class="">
- return;<br class="">
- }<br class="">
- // Write the zero character in place of the last backslash to get the<br class="">
- // directory of the main module at the end of path_buffer.<br class="">
- wchar_t *last_bslash = wcsrchr(path_buffer + sz, L'<a href="smb://'" class="">\\'</a>);<br class="">
- CHECK_NE(last_bslash, 0);<br class="">
- *last_bslash = L'\0';<br class="">
- if (!SymSetSearchPathW(GetCurrentProcess(), path_buffer)) {<br class="">
- Report("*** WARNING: Failed to SymSetSearchPathW\n");<br class="">
- return;<br class="">
- }<br class="">
- }<br class="">
-<br class="">
- bool TrySymInitialize() {<br class="">
- SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES);<br class="">
- return SymInitialize(GetCurrentProcess(), 0, TRUE);<br class="">
- // FIXME: We don't call SymCleanup() on exit yet - should we?<br class="">
- }<br class="">
-<br class="">
- // All DbgHelp functions are single threaded, so we should use a mutex to<br class="">
- // serialize accesses.<br class="">
- BlockingMutex dbghelp_mu_;<br class="">
- bool initialized_;<br class="">
+ BlockingMutexLock l(&mu_);<br class="">
+ return tool_->Demangle(name);<br class="">
+ }<br class="">
+ bool GetModuleNameAndOffsetForPC(uptr pc, const char **module_name,<br class="">
+ uptr *module_address) override {<br class="">
+ BlockingMutexLock l(&mu_);<br class="">
+ return FindModuleNameAndOffsetForAddress(pc, module_name, module_address);<br class="">
+ }<br class="">
+<br class="">
+ BlockingMutex mu_;<br class="">
+ SymbolizerTool *tool_;<br class="">
};<br class="">
<br class="">
Symbolizer *Symbolizer::PlatformInit() {<br class="">
static bool called_once = false;<br class="">
CHECK(!called_once && "Shouldn't create more than one symbolizer");<br class="">
called_once = true;<br class="">
- return new(symbolizer_allocator_) WinSymbolizer();<br class="">
+ SymbolizerTool *tool = new(symbolizer_allocator_) WinSymbolizerTool();<br class="">
+ return new(symbolizer_allocator_) WinSymbolizer(tool);<br class="">
}<br class="">
<br class="">
} // namespace __sanitizer<br class="">
<br class="">
Added: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h?rev=231478&view=auto" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h?rev=231478&view=auto</a><br class="">
==============================================================================<br class="">
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h (added)<br class="">
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.h Fri Mar 6 08:33:56 2015<br class="">
@@ -0,0 +1,31 @@<br class="">
+//===-- sanitizer_symbolizer_win.h ------------------------------*- C++ -*-===//<br class="">
+//<br class="">
+// The LLVM Compiler Infrastructure<br class="">
+//<br class="">
+// This file is distributed under the University of Illinois Open Source<br class="">
+// License. See LICENSE.TXT for details.<br class="">
+//<br class="">
+//===----------------------------------------------------------------------===//<br class="">
+//<br class="">
+// Header file for the Windows symbolizer tool.<br class="">
+//<br class="">
+//===----------------------------------------------------------------------===//<br class="">
+#ifndef SANITIZER_SYMBOLIZER_WIN_H<br class="">
+#define SANITIZER_SYMBOLIZER_WIN_H<br class="">
+<br class="">
+#include "sanitizer_symbolizer_internal.h"<br class="">
+<br class="">
+namespace __sanitizer {<br class="">
+<br class="">
+class WinSymbolizerTool : public SymbolizerTool {<br class="">
+ public:<br class="">
+ bool SymbolizePC(uptr addr, SymbolizedStack *stack) override;<br class="">
+ bool SymbolizeData(uptr addr, DataInfo *info) override {<br class="">
+ return false;<br class="">
+ }<br class="">
+ const char *Demangle(const char *name) override;<br class="">
+};<br class="">
+<br class="">
+} // namespace __sanitizer<br class="">
+<br class="">
+#endif // SANITIZER_SYMBOLIZER_WIN_H<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@cs.uiuc.edu" class="">llvm-commits@cs.uiuc.edu</a><br class="">
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div>-- <br class=""><div class="gmail_signature"><div dir="ltr" class="">Alexey Samsonov<br class=""><a href="mailto:vonosmas@gmail.com" target="_blank" class="">vonosmas@gmail.com</a></div></div>
</div>
</div></blockquote></div><br class=""></div></body></html>