summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 23:37:43 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 23:37:43 +0000
commitbdc1b48740f319838da527e4a57e4ba454bfdfc4 (patch)
tree139063fcc9bcbcf090427961c6a81b7de1a3d668 /chrome/tools
parent9b0e63e553262024ffa72deaa8a650ee93e17e7d (diff)
downloadchromium_src-bdc1b48740f319838da527e4a57e4ba454bfdfc4.zip
chromium_src-bdc1b48740f319838da527e4a57e4ba454bfdfc4.tar.gz
chromium_src-bdc1b48740f319838da527e4a57e4ba454bfdfc4.tar.bz2
x86-64 Breakpad: Append "-x64" to the pipe name for 64-bit processes
The protocol for connecting to the out-of-process Breakpad crash reporter is different for x86-32 and x86-64 (the message sizes are different because the message struct contains a pointer), so we use different pipe names for the two crash reporters. Appending "-x64" is the simplest way of doing this. It allows two crash handlers to coexist even when using the env var CHROME_BREAKPAD_PIPE_NAME for testing. Google Update (Omaha) does not yet launch an x86-64 crash handler for this to connect to -- that is a work-in-progress. BUG=89730 TEST=compile-tested; will be covered by nacl_integration later Review URL: http://codereview.chromium.org/8231036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-x[-rw-r--r--]chrome/tools/crash_service/crash_service.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc
index 5872935..ba2acbc 100644..100755
--- a/chrome/tools/crash_service/crash_service.cc
+++ b/chrome/tools/crash_service/crash_service.cc
@@ -211,6 +211,10 @@ bool CrashService::Initialize(const std::wstring& command_line) {
if (cmd_line.HasSwitch(kPipeName))
pipe_name = cmd_line.GetSwitchValueNative(kPipeName);
+#ifdef _WIN64
+ pipe_name += L"-x64";
+#endif
+
if (max_reports > 0) {
// Create the http sender object.
sender_ = new CrashReportSender(checkpoint_path.value());