Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: components/crash/content/browser/crash_dump_manager_android.cc

Issue 1447213002: Add stats to distinguish android renderer crashes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove comment and rebase. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/crash/content/browser/crash_dump_manager_android.cc
diff --git a/components/crash/content/browser/crash_dump_manager_android.cc b/components/crash/content/browser/crash_dump_manager_android.cc
index 62e77ad6206c83c83177a64c9d00c3ecc84ff122..1b60e20a324612af4ec8bcba41f0e5eef5beb147 100644
--- a/components/crash/content/browser/crash_dump_manager_android.cc
+++ b/components/crash/content/browser/crash_dump_manager_android.cc
@@ -8,6 +8,7 @@
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
#include "base/posix/global_descriptors.h"
#include "base/process/process.h"
#include "base/rand_util.h"
@@ -81,8 +82,12 @@ base::File CrashDumpManager::CreateMinidumpFile(int child_process_id) {
}
// static
-void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
- base::ProcessHandle pid) {
+void CrashDumpManager::ProcessMinidump(
+ const base::FilePath& minidump_path,
+ base::ProcessHandle pid,
+ content::ProcessType process_type,
+ base::TerminationStatus exit_status,
+ base::android::ApplicationState app_state) {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
CHECK(instance_);
int64 file_size = 0;
@@ -90,6 +95,35 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
DCHECK(r) << "Failed to retrieve size for minidump "
<< minidump_path.value();
+ if (process_type == content::PROCESS_TYPE_RENDERER &&
+ exit_status == base::TERMINATION_STATUS_OOM_PROTECTED) {
+ bool is_running =
+ (app_state == base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES);
+ bool is_paused =
+ (app_state == base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES);
+ ExitStatus renderer_exit_status;
+ if (file_size == 0) {
+ if (is_running) {
+ renderer_exit_status = EMPTY_MINIDUMP_WHILE_RUNNING;
+ } else if (is_paused) {
+ renderer_exit_status = EMPTY_MINIDUMP_WHILE_PAUSED;
+ } else {
+ renderer_exit_status = EMPTY_MINIDUMP_WHILE_BACKGROUND;
+ }
+ } else {
+ if (is_running) {
+ renderer_exit_status = VALID_MINIDUMP_WHILE_RUNNING;
+ } else if (is_paused) {
+ renderer_exit_status = VALID_MINIDUMP_WHILE_PAUSED;
+ } else {
+ renderer_exit_status = VALID_MINIDUMP_WHILE_BACKGROUND;
+ }
+ }
+ UMA_HISTOGRAM_ENUMERATION("Tab.RendererDetailedExitStatus",
+ renderer_exit_status,
+ ExitStatus::COUNT);
+ }
+
if (file_size == 0) {
// Empty minidump, this process did not crash. Just remove the file.
r = base::DeleteFile(minidump_path, false);
@@ -122,13 +156,21 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
void CrashDumpManager::BrowserChildProcessHostDisconnected(
const content::ChildProcessData& data) {
- OnChildExit(data.id, data.handle);
+ OnChildExit(data.id,
+ data.handle,
+ static_cast<content::ProcessType>(data.process_type),
+ /* exit_status */ base::TERMINATION_STATUS_MAX_ENUM,
+ /* app_state */ base::android::APPLICATION_STATE_UNKNOWN);
}
void CrashDumpManager::BrowserChildProcessCrashed(
const content::ChildProcessData& data,
int exit_code) {
- OnChildExit(data.id, data.handle);
+ OnChildExit(data.id,
+ data.handle,
+ static_cast<content::ProcessType>(data.process_type),
+ /* exit_status */ base::TERMINATION_STATUS_ABNORMAL_TERMINATION,
+ /* app_state */ base::android::APPLICATION_STATE_UNKNOWN);
}
void CrashDumpManager::Observe(int type,
@@ -142,7 +184,14 @@ void CrashDumpManager::Observe(int type,
case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
content::RenderProcessHost* rph =
content::Source<content::RenderProcessHost>(source).ptr();
- OnChildExit(rph->GetID(), rph->GetHandle());
+ content::RenderProcessHost::RendererClosedDetails* process_details =
+ content::Details<content::RenderProcessHost::RendererClosedDetails>(
+ details).ptr();
+ OnChildExit(rph->GetID(),
+ rph->GetHandle(),
+ content::PROCESS_TYPE_RENDERER,
+ process_details->status,
+ base::android::ApplicationStatusListener::GetState());
break;
}
default:
@@ -152,7 +201,10 @@ void CrashDumpManager::Observe(int type,
}
void CrashDumpManager::OnChildExit(int child_process_id,
- base::ProcessHandle pid) {
+ base::ProcessHandle pid,
+ content::ProcessType process_type,
+ base::TerminationStatus exit_status,
+ base::android::ApplicationState app_state) {
base::FilePath minidump_path;
{
base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
@@ -168,7 +220,12 @@ void CrashDumpManager::OnChildExit(int child_process_id,
}
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- base::Bind(&CrashDumpManager::ProcessMinidump, minidump_path, pid));
+ base::Bind(&CrashDumpManager::ProcessMinidump,
+ minidump_path,
+ pid,
+ process_type,
+ exit_status,
+ app_state));
}
} // namespace breakpad
« no previous file with comments | « components/crash/content/browser/crash_dump_manager_android.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698