summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 18:41:45 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 18:41:45 +0000
commitf40287a3b59f476a3b2835b84192611933b272c7 (patch)
tree0c778944f4cdc2786bd94e464eef8d8474a17e7e /base
parent3138b26f41abf458eed7e55927b90105fe20b3c8 (diff)
downloadchromium_src-f40287a3b59f476a3b2835b84192611933b272c7.zip
chromium_src-f40287a3b59f476a3b2835b84192611933b272c7.tar.gz
chromium_src-f40287a3b59f476a3b2835b84192611933b272c7.tar.bz2
GTTF: Make debug symbol "resolution" work even after binaries are moved.
This happens e.g. between the builder and tester bots. BUG=168411 Review URL: https://codereview.chromium.org/12557003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/debug/stack_trace_win.cc37
1 files changed, 34 insertions, 3 deletions
diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc
index da75b0b..955c03d 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;
}
}