Skip to content

Commit

Permalink
Revert "aw: Add DumpWithoutCrashing to debug terminator"
Browse files Browse the repository at this point in the history
This reverts commit 7e927f7.

Reason for revert:
DumpWithoutCrashing generating too much noise and not useful.
Fixed: 1135529

Original change's description:
> aw: Add DumpWithoutCrashing to debug terminator
>
> Hopefully getting the stack and some info of of when a
> !normal_termination and kInvalidSigno happens will be helpful to pin
> down the cause.
>
> Bug: 1115216
> Change-Id: I4bda59c1e27782e7688d1594c8af6efba6c1c9c7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2448058
> Reviewed-by: Richard Coles <torne@chromium.org>
> Commit-Queue: Bo <boliu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#813865}

TBR=boliu@chromium.org,torne@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1115216
Change-Id: Ib4cdc1f95e9340ad700e82500452c920786546d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453503
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814391}
  • Loading branch information
Bo authored and Commit Bot committed Oct 6, 2020
1 parent 1673a55 commit 84722cd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 20 deletions.
17 changes: 0 additions & 17 deletions android_webview/browser/aw_browser_terminator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
#include "android_webview/browser/aw_browser_process.h"
#include "android_webview/browser/aw_render_process_gone_delegate.h"
#include "android_webview/common/aw_descriptors.h"
#include "android_webview/common/crash_reporter/crash_keys.h"
#include "base/android/scoped_java_ref.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
Expand Down Expand Up @@ -126,20 +123,6 @@ void AwBrowserTerminator::OnChildExit(
LOG(ERROR) << "Renderer process (" << info.pid << ") crash detected (code "
<< info.crash_signo << ").";

if (info.crash_signo ==
crash_reporter::ChildExitObserver::TerminationInfo::kInvalidSigno) {
static auto* termination_info_key = base::debug::AllocateCrashKeyString(
crash_keys::kTerminationInfo, base::debug::CrashKeySize::Size32);
std::ostringstream stream;
stream << info.was_killed_intentionally_by_browser << " "
<< info.renderer_shutdown_requested << " "
<< info.threw_exception_during_init << " "
<< info.renderer_has_visible_clients;
base::debug::SetCrashKeyString(termination_info_key, stream.str());
base::debug::DumpWithoutCrashing();
base::debug::ClearCrashKeyString(termination_info_key);
}

std::vector<ScopedJavaGlobalRef<jobject>> java_web_contents;
GetJavaWebContentsForRenderProcess(rph, &java_web_contents);

Expand Down
2 changes: 0 additions & 2 deletions android_webview/common/crash_reporter/crash_keys.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const char kAppPackageVersionCode[] = "app-package-version-code";
const char kAppProcessName[] = "app-process-name";

const char kAndroidSdkInt[] = "android-sdk-int";
const char kTerminationInfo[] = "termination-info";

const char kSupportLibraryWebkitVersion[] = "androidx-webkit-version";

Expand All @@ -29,7 +28,6 @@ const char* const kWebViewCrashKeyAllowList[] = {
kAppProcessName,
kAndroidSdkInt,
kSupportLibraryWebkitVersion,
kTerminationInfo,

// process type
"ptype",
Expand Down
1 change: 0 additions & 1 deletion android_webview/common/crash_reporter/crash_keys.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ extern const char kAppPackageVersionCode[];
extern const char kAppProcessName[];

extern const char kAndroidSdkInt[];
extern const char kTerminationInfo[];

extern const char kSupportLibraryWebkitVersion[];

Expand Down

0 comments on commit 84722cd

Please sign in to comment.