3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-28 15:50:26 +08:00
Code Issues Projects Releases Wiki Activity

win: Make DumpAndCrash() always terminate, and tidy up special codes

Browse Source 
Upstreaming with tidying up of
https://codereview.chromium.org/2377693002/.

R=mark@chromium.org
BUG=chromium:634418

Change-Id: Ie8b3b673c8d2a06c5cc918a034688aa9396cfbf4
Reviewed-on: https://chromium-review.googlesource.com/390436
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Scott Graham 2016-09-28 20:18:39 -07:00
parent 5a6c961658
commit a16a7fd4ef
4 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/crashpad_client_win.cc
View File

@ -39,6 +39,7 @@
#include "util/win/registration_protocol_win.h"
#include "util/win/scoped_handle.h"
#include "util/win/scoped_process_suspend.h"
#include "util/win/termination_codes.h"
namespace {
@ -109,8 +110,7 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
LOG(ERROR) << "crash server did not respond, self-terminating";
const UINT kCrashExitCodeNoDump = 0xffff7001;
TerminateProcess(GetCurrentProcess(), kCrashExitCodeNoDump);
TerminateProcess(GetCurrentProcess(), crashpad::kTerminationCodeCrashNoDump);
return EXCEPTION_CONTINUE_SEARCH;
}
@ -487,7 +487,8 @@ void CrashpadClient::DumpWithoutCrash(const CONTEXT& context) {
// static
void CrashpadClient::DumpAndCrash(EXCEPTION_POINTERS* exception_pointers) {
if (g_signal_exception == INVALID_HANDLE_VALUE) {
LOG(ERROR) << "haven't called UseHandler()";
LOG(ERROR) << "haven't called UseHandler(), no dump captured";
TerminateProcess(GetCurrentProcess(), kTerminationCodeUseHandlerNotCalled);
return;
}

5
handler/win/crash_report_exception_handler.cc
View File

@ -25,6 +25,7 @@
#include "util/misc/metrics.h"
#include "util/win/registration_protocol_win.h"
#include "util/win/scoped_process_suspend.h"
#include "util/win/termination_codes.h"
namespace crashpad {
@ -47,8 +48,6 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
HANDLE process,
WinVMAddress exception_information_address,
WinVMAddress debug_critical_section_address) {
const unsigned int kFailedTerminationCode = 0xffff7002;
Metrics::ExceptionEncountered();
ScopedProcessSuspend suspend(process);
@ -60,7 +59,7 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
debug_critical_section_address)) {
LOG(WARNING) << "ProcessSnapshotWin::Initialize failed";
Metrics::ExceptionCaptureResult(Metrics::CaptureResult::kSnapshotFailed);
return kFailedTerminationCode;
return kTerminationCodeSnapshotFailed;
}
// Now that we have the exception information, even if something else fails we

1
util/util.gyp
View File

@ -189,6 +189,7 @@
'win/scoped_local_alloc.h',
'win/scoped_process_suspend.cc',
'win/scoped_process_suspend.h',
'win/termination_codes.h',
'win/time.cc',
'win/time.h',
'win/xp_compat.h',

37
util/win/termination_codes.h Normal file
View File

@ -0,0 +1,37 @@
// Copyright 2016 The Crashpad Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_
#define CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_
namespace crashpad {
//! \brief Crashpad-specific codes that are used as arguments to
//! `TerminateProcess()` in unusual circumstances.
enum TerminationCodes : unsigned int {
//! \brief The crash handler did not respond, and the client self-terminated.
kTerminationCodeCrashNoDump = 0xffff7001,
//! \brief The initial process snapshot failed, so the correct client
//! termination code could not be retrieved.
kTerminationCodeSnapshotFailed = 0xffff7002,
//! \brief A dump was requested for a client that was never registered with
//! the crash handler.
kTerminationCodeUseHandlerNotCalled = 0xffff7003,
};
} // namespace crashpad
#endif // CRASHPAD_UTIL_WIN_TERMINATION_CODES_H_