Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2744)

Unified Diff: base/debug/stack_trace_win.cc

Issue 12557003: GTTF: Make debug symbol "resolution" work even after binaries are moved. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizeof -> arraysize Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/stack_trace_win.cc
diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc
index da75b0b61778e7685c90cad554a965c0010c136f..955c03dd8675d918b912252a9197b80c3d46f1d5 100644
--- a/base/debug/stack_trace_win.cc
+++ b/base/debug/stack_trace_win.cc
@@ -12,7 +12,9 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
+#include "base/path_service.h"
#include "base/process_util.h"
+#include "base/string_util.h"
#include "base/synchronization/lock.h"
namespace base {
@@ -129,9 +131,7 @@ class SymbolContext {
SymSetOptions(SYMOPT_DEFERRED_LOADS |
SYMOPT_UNDNAME |
SYMOPT_LOAD_LINES);
- if (SymInitialize(GetCurrentProcess(), NULL, TRUE)) {
- init_error_ = ERROR_SUCCESS;
- } else {
+ if (!SymInitialize(GetCurrentProcess(), NULL, TRUE)) {
init_error_ = GetLastError();
// TODO(awong): Handle error: SymInitialize can fail with
// ERROR_INVALID_PARAMETER.
@@ -139,6 +139,37 @@ class SymbolContext {
// process (prevents future tests from running or kills the browser
// process).
DLOG(ERROR) << "SymInitialize failed: " << init_error_;
+ return;
+ }
+
+ init_error_ = ERROR_SUCCESS;
+
+ // When transferring the binaries e.g. between bots, path put
+ // into the executable will get off. To still retrieve symbols correctly,
+ // add the directory of the executable to symbol search path.
+ // All following errors are non-fatal.
+ wchar_t symbols_path[1024];
+
+ // Note: The below function takes buffer size as number of characters,
+ // not number of bytes!
+ if (!SymGetSearchPathW(GetCurrentProcess(),
+ symbols_path,
+ arraysize(symbols_path))) {
+ DLOG(WARNING) << "SymGetSearchPath failed: ";
+ return;
+ }
+
+ FilePath module_path;
+ if (!PathService::Get(FILE_EXE, &module_path)) {
+ DLOG(WARNING) << "PathService::Get(FILE_EXE) failed.";
+ return;
+ }
+
+ std::wstring new_path(std::wstring(symbols_path) +
+ L";" + module_path.DirName().value());
+ if (!SymSetSearchPathW(GetCurrentProcess(), new_path.c_str())) {
+ DLOG(WARNING) << "SymSetSearchPath failed.";
+ return;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698