diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 21:59:22 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 21:59:22 +0000 |
commit | 64bb17217fe9f6896d8c768dce96cc2183d3583a (patch) | |
tree | ff55489a35a31c64ddf08a171a3b4cdc53b48b3d /base | |
parent | d3b83bc85a8ab5d532b2fbe260219cc4e0287d89 (diff) | |
download | chromium_src-64bb17217fe9f6896d8c768dce96cc2183d3583a.zip chromium_src-64bb17217fe9f6896d8c768dce96cc2183d3583a.tar.gz chromium_src-64bb17217fe9f6896d8c768dce96cc2183d3583a.tar.bz2 |
Revert "GTTF: Make debug symbol "resolution" work even after binaries are moved."
TBR=jar
BUG=168411
Review URL: https://codereview.chromium.org/12447012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/debug/stack_trace_win.cc | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc index 955c03d..da75b0b 100644 --- a/base/debug/stack_trace_win.cc +++ b/base/debug/stack_trace_win.cc @@ -12,9 +12,7 @@ #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 { @@ -131,7 +129,9 @@ class SymbolContext { SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES); - if (!SymInitialize(GetCurrentProcess(), NULL, TRUE)) { + if (SymInitialize(GetCurrentProcess(), NULL, TRUE)) { + init_error_ = ERROR_SUCCESS; + } else { init_error_ = GetLastError(); // TODO(awong): Handle error: SymInitialize can fail with // ERROR_INVALID_PARAMETER. @@ -139,37 +139,6 @@ 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; } } |