summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_channel.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/ipc_sync_channel.cc')
-rw-r--r--ipc/ipc_sync_channel.cc18
1 files changed, 5 insertions, 13 deletions
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index 092119c..682286f 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -5,7 +5,6 @@
#include "ipc/ipc_sync_channel.h"
#include "base/bind.h"
-#include "base/debug/stack_trace.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
@@ -308,9 +307,9 @@ bool SyncChannel::SyncContext::TryToUnblockListener(const Message* msg) {
bool send_result = deserializers_.back().deserializer->
SerializeOutputParameters(*msg);
deserializers_.back().send_result = send_result;
- VLOG_IF(1, !send_result) << "Couldn't deserialize reply message";
+ LOG_IF(ERROR, !send_result) << "Couldn't deserialize reply message";
} else {
- VLOG(1) << "Received error reply";
+ LOG(ERROR) << "Received error reply";
}
deserializers_.back().done_event->Signal();
@@ -364,7 +363,7 @@ void SyncChannel::SyncContext::OnChannelClosed() {
void SyncChannel::SyncContext::OnSendTimeout(int message_id) {
base::AutoLock auto_lock(deserializers_lock_);
PendingSyncMessageQueue::iterator iter;
- VLOG(1) << "Send timeout";
+ LOG(ERROR) << "Send timeout";
for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++) {
if (iter->id == message_id) {
iter->done_event->Signal();
@@ -376,14 +375,7 @@ void SyncChannel::SyncContext::OnSendTimeout(int message_id) {
void SyncChannel::SyncContext::CancelPendingSends() {
base::AutoLock auto_lock(deserializers_lock_);
PendingSyncMessageQueue::iterator iter;
-#if !defined(OS_ANDROID) && !defined(OS_NACL)
- // TODO(bauerb): Remove once http://crbug/141055 is fixed.
- if (VLOG_IS_ON(1)) {
- VLOG(1) << "Canceling pending sends";
- base::debug::StackTrace trace;
- trace.PrintBacktrace();
- }
-#endif
+ LOG(ERROR) << "Canceling pending sends";
for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++)
iter->done_event->Signal();
}
@@ -443,7 +435,7 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) {
// *this* might get deleted in WaitForReply.
scoped_refptr<SyncContext> context(sync_context());
if (context->shutdown_event()->IsSignaled()) {
- VLOG(1) << "shutdown event is signaled";
+ LOG(ERROR) << "shutdown event is signaled";
delete message;
return false;
}