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..e8213511605ac837f3ed134ef5b085ed96834e3f 100644 |
--- a/components/crash/content/browser/crash_dump_manager_android.cc |
+++ b/components/crash/content/browser/crash_dump_manager_android.cc |
@@ -4,10 +4,12 @@ |
#include "components/crash/content/browser/crash_dump_manager_android.h" |
+#include "base/android/application_status_listener.h" |
#include "base/bind.h" |
#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" |
@@ -82,7 +84,9 @@ base::File CrashDumpManager::CreateMinidumpFile(int child_process_id) { |
// static |
void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path, |
- base::ProcessHandle pid) { |
+ base::ProcessHandle pid, |
+ content::ProcessType process_type, |
+ bool record_exit_status) { |
DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
CHECK(instance_); |
int64 file_size = 0; |
@@ -90,6 +94,19 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path, |
DCHECK(r) << "Failed to retrieve size for minidump " |
<< minidump_path.value(); |
+ if (record_exit_status) { |
+ DCHECK(process_type == content::PROCESS_TYPE_RENDERER); |
Yaron
2015/11/19 18:57:05
DCHECK_EQ
Peter Wen
2015/11/19 19:48:15
Acknowledged.
|
+ int exitStatus; |
Yaron
2015/11/19 18:57:05
exit_status
Peter Wen
2015/11/19 19:48:15
Done.
|
+ if (file_size == 0) { |
+ exitStatus = ExitStatus::EMPTY_MINIDUMP; |
+ } else { |
+ exitStatus = ExitStatus::VALID_MINIDUMP; |
+ } |
+ UMA_HISTOGRAM_ENUMERATION("Tab.RendererDetailedExitStatus", |
+ exitStatus, |
+ 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 +139,19 @@ 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), |
+ /* record_exit_status */ false); |
} |
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), |
+ /* record_exit_status */ false); |
} |
void CrashDumpManager::Observe(int type, |
@@ -142,7 +165,20 @@ 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(); |
+ bool record_exit_status = false; |
+ // Only record OOM protected renderers that die while the app is in the |
+ // foreground. This matches with conditions in TabWebContentsObserver. |
+ if (process_details->status == base::TERMINATION_STATUS_OOM_PROTECTED && |
+ base::android::ApplicationStatusListener::HasVisibleActivities()) { |
+ record_exit_status = true; |
+ } |
+ OnChildExit(rph->GetID(), |
+ rph->GetHandle(), |
+ content::PROCESS_TYPE_RENDERER, |
+ record_exit_status); |
break; |
} |
default: |
@@ -152,7 +188,9 @@ void CrashDumpManager::Observe(int type, |
} |
void CrashDumpManager::OnChildExit(int child_process_id, |
- base::ProcessHandle pid) { |
+ base::ProcessHandle pid, |
+ content::ProcessType process_type, |
+ bool record_exit_status) { |
base::FilePath minidump_path; |
{ |
base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_); |
@@ -168,7 +206,11 @@ 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, |
+ record_exit_status)); |
} |
} // namespace breakpad |