diff options
Diffstat (limited to 'ipc/ipc_channel_posix.cc')
-rw-r--r-- | ipc/ipc_channel_posix.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 09b72d5..8788532 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -31,7 +31,6 @@ #include "base/posix/global_descriptors.h" #include "base/process/process_handle.h" #include "base/rand_util.h" -#include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" @@ -328,7 +327,7 @@ bool Channel::ChannelImpl::CreatePipe( bool Channel::ChannelImpl::Connect() { if (server_listen_pipe_ == -1 && pipe_ == -1) { - DLOG(WARNING) << "Channel creation failed: " << pipe_name_; + DLOG(INFO) << "Channel creation failed: " << pipe_name_; return false; } @@ -520,18 +519,10 @@ bool Channel::ChannelImpl::Send(Message* message) { Logging::GetInstance()->OnSendMessage(message, ""); #endif // IPC_MESSAGE_LOG_ENABLED - if (!waiting_connect_ && pipe_ == -1) { - delete message; - return false; - } - message->TraceMessageBegin(); output_queue_.push(message); if (!is_blocked_on_write_ && !waiting_connect_) { - if (!ProcessOutgoingMessages()) { - ClosePipeOnError(); - return false; - } + return ProcessOutgoingMessages(); } return true; @@ -716,11 +707,7 @@ bool Channel::ChannelImpl::AcceptConnection() { // In server mode we will send a hello message when we receive one from a // client. waiting_connect_ = false; - if (!ProcessOutgoingMessages()) { - ClosePipeOnError(); - return false; - } - return true; + return ProcessOutgoingMessages(); } else if (mode_ & MODE_SERVER_FLAG) { waiting_connect_ = true; return true; |