Commit 211142cd authored by bauerb@chromium.org's avatar bauerb@chromium.org

Add moar logging for "Couldn't load plug-in" errors.


BUG=141055

Review URL: https://chromiumcodereview.appspot.com/10854092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151246 0039d316-1c4b-4281-b951-d872f2087c98
parent 5e551b10
...@@ -141,6 +141,7 @@ bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop, ...@@ -141,6 +141,7 @@ bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop,
bool NPChannelBase::Send(IPC::Message* message) { bool NPChannelBase::Send(IPC::Message* message) {
if (!channel_.get()) { if (!channel_.get()) {
LOG(ERROR) << "Channel is NULL; dropping message";
delete message; delete message;
return false; return false;
} }
......
...@@ -301,9 +301,15 @@ bool SyncChannel::SyncContext::TryToUnblockListener(const Message* msg) { ...@@ -301,9 +301,15 @@ bool SyncChannel::SyncContext::TryToUnblockListener(const Message* msg) {
return false; return false;
} }
// TODO(bauerb): Remove logging once investigation of http://crbug.com/141055
// has finished.
if (!msg->is_reply_error()) { if (!msg->is_reply_error()) {
deserializers_.back().send_result = deserializers_.back().deserializer-> bool send_result = deserializers_.back().deserializer->
SerializeOutputParameters(*msg); SerializeOutputParameters(*msg);
deserializers_.back().send_result = send_result;
LOG_IF(ERROR, !send_result) << "Couldn't deserialize reply message";
} else {
LOG(ERROR) << "Received error reply";
} }
deserializers_.back().done_event->Signal(); deserializers_.back().done_event->Signal();
...@@ -357,6 +363,7 @@ void SyncChannel::SyncContext::OnChannelClosed() { ...@@ -357,6 +363,7 @@ void SyncChannel::SyncContext::OnChannelClosed() {
void SyncChannel::SyncContext::OnSendTimeout(int message_id) { void SyncChannel::SyncContext::OnSendTimeout(int message_id) {
base::AutoLock auto_lock(deserializers_lock_); base::AutoLock auto_lock(deserializers_lock_);
PendingSyncMessageQueue::iterator iter; PendingSyncMessageQueue::iterator iter;
LOG(ERROR) << "Send timeout";
for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++) { for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++) {
if (iter->id == message_id) { if (iter->id == message_id) {
iter->done_event->Signal(); iter->done_event->Signal();
...@@ -368,6 +375,7 @@ void SyncChannel::SyncContext::OnSendTimeout(int message_id) { ...@@ -368,6 +375,7 @@ void SyncChannel::SyncContext::OnSendTimeout(int message_id) {
void SyncChannel::SyncContext::CancelPendingSends() { void SyncChannel::SyncContext::CancelPendingSends() {
base::AutoLock auto_lock(deserializers_lock_); base::AutoLock auto_lock(deserializers_lock_);
PendingSyncMessageQueue::iterator iter; PendingSyncMessageQueue::iterator iter;
LOG(ERROR) << "Canceling pending sends";
for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++) for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++)
iter->done_event->Signal(); iter->done_event->Signal();
} }
...@@ -427,6 +435,7 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) { ...@@ -427,6 +435,7 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) {
// *this* might get deleted in WaitForReply. // *this* might get deleted in WaitForReply.
scoped_refptr<SyncContext> context(sync_context()); scoped_refptr<SyncContext> context(sync_context());
if (context->shutdown_event()->IsSignaled()) { if (context->shutdown_event()->IsSignaled()) {
LOG(ERROR) << "shutdown event is signaled";
delete message; delete message;
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment