summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authormorrita <morrita@chromium.org>2015-03-16 15:40:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-16 22:42:04 +0000
commita3889aa737db9a6e94b24c5f5f0dc33154bfa2c6 (patch)
tree0f757ba6257b821ce48c0d23a5025c50ad214014 /ipc
parente0f2b8f00e9a70285f25c42d4ab9612b0e0013ca (diff)
downloadchromium_src-a3889aa737db9a6e94b24c5f5f0dc33154bfa2c6.zip
chromium_src-a3889aa737db9a6e94b24c5f5f0dc33154bfa2c6.tar.gz
chromium_src-a3889aa737db9a6e94b24c5f5f0dc33154bfa2c6.tar.bz2
ChannelMojo: Turn DLOG to LOG for ERROR and WARNING
It'd be useful to diagnose IPC related issues, especially Chrome OS builds where Release build is the norm. This shouldn't be noisy as these won't happen in normal use. R=viettrungluu@chromium.org TEST=466814 BUG= Review URL: https://codereview.chromium.org/1003483004 Cr-Commit-Position: refs/heads/master@{#320810}
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mojo/ipc_channel_mojo.cc8
-rw-r--r--ipc/mojo/ipc_message_pipe_reader.cc4
-rw-r--r--ipc/mojo/ipc_mojo_bootstrap.cc4
-rw-r--r--ipc/mojo/ipc_mojo_handle_attachment.cc2
-rw-r--r--ipc/mojo/ipc_mojo_message_helper.cc4
5 files changed, 11 insertions, 11 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index 434d09d..0d77fb9 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -141,7 +141,7 @@ void ServerChannelMojo::OnPipeAvailable(
MojoResult create_result =
mojo::CreateMessagePipe(nullptr, &message_pipe_, &peer);
if (create_result != MOJO_RESULT_OK) {
- DLOG(WARNING) << "mojo::CreateMessagePipe failed: " << create_result;
+ LOG(WARNING) << "mojo::CreateMessagePipe failed: " << create_result;
listener()->OnChannelError();
return;
}
@@ -392,8 +392,8 @@ MojoResult ChannelMojo::ReadFromMessageAttachmentSet(
mojo::embedder::PlatformHandle(file.release())),
&wrapped_handle);
if (MOJO_RESULT_OK != wrap_result) {
- DLOG(WARNING) << "Pipe failed to wrap handles. Closing: "
- << wrap_result;
+ LOG(WARNING) << "Pipe failed to wrap handles. Closing: "
+ << wrap_result;
set->CommitAll();
return wrap_result;
}
@@ -429,7 +429,7 @@ MojoResult ChannelMojo::WriteToMessageAttachmentSet(
mojo::MakeScopedHandle(mojo::Handle(handle_buffer[i]))));
DCHECK(ok);
if (!ok) {
- DLOG(ERROR) << "Failed to add new Mojo handle.";
+ LOG(ERROR) << "Failed to add new Mojo handle.";
return MOJO_RESULT_UNKNOWN;
}
}
diff --git a/ipc/mojo/ipc_message_pipe_reader.cc b/ipc/mojo/ipc_message_pipe_reader.cc
index 72e7ad7..61b36f6 100644
--- a/ipc/mojo/ipc_message_pipe_reader.cc
+++ b/ipc/mojo/ipc_message_pipe_reader.cc
@@ -168,7 +168,7 @@ void MessagePipeReader::ReadMessagesThenWait() {
// We have to consume then and retry in that case.
if (result != MOJO_RESULT_ALREADY_EXISTS) {
if (result != MOJO_RESULT_OK) {
- DLOG(ERROR) << "Result is " << result;
+ LOG(ERROR) << "Failed to wait on the pipe. Result is " << result;
OnPipeError(result);
Close();
}
@@ -183,7 +183,7 @@ void MessagePipeReader::PipeIsReady(MojoResult wait_result) {
if (wait_result != MOJO_RESULT_ABORTED) {
// FAILED_PRECONDITION happens every time the peer is dead so
// it isn't worth polluting the log message.
- DLOG_IF(WARNING, wait_result != MOJO_RESULT_FAILED_PRECONDITION)
+ LOG_IF(WARNING, wait_result != MOJO_RESULT_FAILED_PRECONDITION)
<< "Pipe got error from the waiter. Closing: " << wait_result;
OnPipeError(wait_result);
}
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc
index e449577..d307246 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -61,7 +61,7 @@ void MojoServerBootstrap::SendClientPipe() {
// GetFileHandleForProcess() only fails on Windows.
NOTREACHED();
#endif
- DLOG(WARNING) << "Failed to translate file handle for client process.";
+ LOG(WARNING) << "Failed to translate file handle for client process.";
Fail();
return;
}
@@ -143,7 +143,7 @@ bool MojoClientBootstrap::OnMessageReceived(const Message& message) {
PlatformFileForTransit pipe;
PickleIterator iter(message);
if (!ParamTraits<PlatformFileForTransit>::Read(&message, &iter, &pipe)) {
- DLOG(WARNING) << "Failed to read a file handle from bootstrap channel.";
+ LOG(WARNING) << "Failed to read a file handle from bootstrap channel.";
message.set_dispatch_error();
return false;
}
diff --git a/ipc/mojo/ipc_mojo_handle_attachment.cc b/ipc/mojo/ipc_mojo_handle_attachment.cc
index 46acd02..98ac5c3 100644
--- a/ipc/mojo/ipc_mojo_handle_attachment.cc
+++ b/ipc/mojo/ipc_mojo_handle_attachment.cc
@@ -27,7 +27,7 @@ base::PlatformFile MojoHandleAttachment::TakePlatformFile() {
MojoResult unwrap_result = mojo::embedder::PassWrappedPlatformHandle(
handle_.release().value(), &platform_handle);
if (unwrap_result != MOJO_RESULT_OK) {
- DLOG(ERROR) << "Pipe failed to covert handles. Closing: " << unwrap_result;
+ LOG(ERROR) << "Pipe failed to covert handles. Closing: " << unwrap_result;
return -1;
}
diff --git a/ipc/mojo/ipc_mojo_message_helper.cc b/ipc/mojo/ipc_mojo_message_helper.cc
index c6f6dbf..38b870d 100644
--- a/ipc/mojo/ipc_mojo_message_helper.cc
+++ b/ipc/mojo/ipc_mojo_message_helper.cc
@@ -24,12 +24,12 @@ bool MojoMessageHelper::ReadMessagePipeFrom(
mojo::ScopedMessagePipeHandle* handle) {
scoped_refptr<MessageAttachment> attachment;
if (!message->ReadAttachment(iter, &attachment)) {
- DLOG(ERROR) << "Failed to read attachment for message pipe.";
+ LOG(ERROR) << "Failed to read attachment for message pipe.";
return false;
}
if (attachment->GetType() != MessageAttachment::TYPE_MOJO_HANDLE) {
- DLOG(ERROR) << "Unxpected attachment type:" << attachment->GetType();
+ LOG(ERROR) << "Unxpected attachment type:" << attachment->GetType();
return false;
}