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

Unified Diff: chrome/browser/ui/hung_plugin_tab_helper.cc

Issue 10909241: Generate dumps for relevant renderers when users kill a hung pepper plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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: chrome/browser/ui/hung_plugin_tab_helper.cc
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 97fdd539035ac7d81b8506dab59f245d8200e10d..5e80044e874e84a387d358a0575398a9dcb530a3 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -5,19 +5,24 @@
#include "chrome/browser/ui/hung_plugin_tab_helper.h"
#include "base/bind.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/process.h"
#include "base/process_util.h"
+#include "base/rand_util.h"
#include "build/build_config.h"
#include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
#include "chrome/browser/infobars/infobar.h"
#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_data.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/plugin_service.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -62,6 +67,35 @@ void KillPluginOnIOThread(int child_id) {
// before this function could run.
}
+#if defined(OS_WIN)
+class OwnedHandleVector {
+ public:
+ OwnedHandleVector() {}
+
+ ~OwnedHandleVector() {
+ for (std::vector<HANDLE>::const_iterator iter = data_.begin();
+ iter != data_.end(); ++iter) {
+ ::CloseHandle(*iter);
+ }
+ }
+
+ std::vector<HANDLE>& data() { return data_; }
+
+ private:
+ std::vector<HANDLE> data_;
+
+ DISALLOW_COPY_AND_ASSIGN(OwnedHandleVector);
+};
+
+void DumpRenderersOnIOThread(OwnedHandleVector* renderer_handles) {
+ for (std::vector<HANDLE>::const_iterator iter =
+ renderer_handles->data().begin();
+ iter != renderer_handles->data().end(); ++iter) {
+ CrashDumpIfProcessHandlingPepper(*iter);
+ }
+}
+#endif
+
} // namespace
class HungPluginTabHelper::InfoBarDelegate : public ConfirmInfoBarDelegate {
@@ -238,6 +272,39 @@ void HungPluginTabHelper::Observe(
}
void HungPluginTabHelper::KillPlugin(int child_id) {
+#if defined(OS_WIN)
+ // Dump renderers that are sending or receiving pepper messages, in order to
+ // diagnose inter-process deadlocks.
+ // Only do that on the Canary channel, for 20% of pepper plugin hangs.
+ if (base::RandInt(0, 100) < 20) {
+ chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+ if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
+ scoped_ptr<OwnedHandleVector> renderer_handles(new OwnedHandleVector);
+ HANDLE current_process = ::GetCurrentProcess();
+ content::RenderProcessHost::iterator renderer_iter =
+ content::RenderProcessHost::AllHostsIterator();
+ for (; !renderer_iter.IsAtEnd(); renderer_iter.Advance()) {
+ content::RenderProcessHost* host = renderer_iter.GetCurrentValue();
+ HANDLE handle = NULL;
+ ::DuplicateHandle(current_process, host->GetHandle(), current_process,
+ &handle, 0, FALSE, DUPLICATE_SAME_ACCESS);
+ renderer_handles->data().push_back(handle);
+ }
+ // If there are a lot of renderer processes, it is likely that we will
+ // generate too many crash dumps. They might not all be uploaded/recorded
+ // due to our crash dump uploading restrictions. So we just don't generate
+ // renderer crash dumps in that case.
+ if (renderer_handles->data().size() > 0 &&
+ renderer_handles->data().size() < 8) {
+ content::BrowserThread::PostTask(
eroman 2012/09/17 19:23:48 Why is it necessary to duplicate the handles, and
yzshen1 2012/09/17 20:11:03 The reasons why I did it this way: - I know that w
+ content::BrowserThread::IO, FROM_HERE,
+ base::Bind(&DumpRenderersOnIOThread,
+ base::Owned(renderer_handles.release())));
+ }
+ }
+ }
+#endif
+
PluginStateMap::iterator found = hung_plugins_.find(child_id);
if (found == hung_plugins_.end()) {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698