diff options
author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:04:02 +0000 |
---|---|---|
committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:04:02 +0000 |
commit | 3e52b6044345e2f0ca4d381b0dae0d950c258293 (patch) | |
tree | 822acd5d3966d86179cfeff647289c2794c9feaf /ppapi/proxy/host_dispatcher.cc | |
parent | 5e1e317d3eb11e344eae295027871d801bbf2343 (diff) | |
download | chromium_src-3e52b6044345e2f0ca4d381b0dae0d950c258293.zip chromium_src-3e52b6044345e2f0ca4d381b0dae0d950c258293.tar.gz chromium_src-3e52b6044345e2f0ca4d381b0dae0d950c258293.tar.bz2 |
Generate dumps for relevant renderers when users kill a hung pepper plugin.
This CL collects information in order to diagnose inter-process pepper deadlocks.
We don't crash those renderers. And we only do this on the Windows Canary channel, for 20% of pepper plugin hangs.
BUG=147593
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10909241
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/host_dispatcher.cc')
-rw-r--r-- | ppapi/proxy/host_dispatcher.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index 21dc269..b89032a 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc @@ -4,8 +4,6 @@ #include "ppapi/proxy/host_dispatcher.h" -#include <map> - #include "base/debug/trace_event.h" #include "base/logging.h" #include "ppapi/c/private/ppb_proxy_private.h" @@ -15,6 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/resource_creation_proxy.h" #include "ppapi/shared_impl/ppapi_globals.h" +#include "ppapi/shared_impl/ppapi_message_tracker.h" namespace ppapi { namespace proxy { @@ -133,6 +132,8 @@ bool HostDispatcher::IsPlugin() const { } bool HostDispatcher::Send(IPC::Message* msg) { + ScopedTrackPpapiMessage track_ppapi_message; + TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send", "Class", IPC_MESSAGE_ID_CLASS(msg->type()), "Line", IPC_MESSAGE_ID_LINE(msg->type())); @@ -171,6 +172,8 @@ bool HostDispatcher::Send(IPC::Message* msg) { } bool HostDispatcher::OnMessageReceived(const IPC::Message& msg) { + ScopedTrackPpapiMessage track_ppapi_message; + TRACE_EVENT2("ppapi proxy", "HostDispatcher::OnMessageReceived", "Class", IPC_MESSAGE_ID_CLASS(msg.type()), "Line", IPC_MESSAGE_ID_LINE(msg.type())); |