Fix posix IPC channel hanging problem, take 3

ipc/ipc_channel_posix_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // These tests are POSIX only.
 
 #include "ipc/ipc_channel_posix.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
@@ skipping 23 matching lines @@
   enum STATUS {
     DISCONNECTED,
     MESSAGE_RECEIVED,
     CHANNEL_ERROR,
     CONNECTED,
     DENIED,
     LISTEN_ERROR
   };
 
   IPCChannelPosixTestListener(bool quit_only_on_message)
-      : status_(DISCONNECTED), quit_only_on_message_(quit_only_on_message) {}
+      : status_(DISCONNECTED),
+        quit_only_on_message_(quit_only_on_message) {
+  }
 
   virtual ~IPCChannelPosixTestListener() {}
 
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     EXPECT_EQ(message.type(), kQuitMessage);
     status_ = MESSAGE_RECEIVED;
     QuitRunLoop();
     return true;
   }
 
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
     status_ = CONNECTED;
     if (!quit_only_on_message_) {
       QuitRunLoop();
     }
   }
 
   virtual void OnChannelError() OVERRIDE {
     status_ = CHANNEL_ERROR;
-    if (!quit_only_on_message_) {
-      QuitRunLoop();
-    }
+    QuitRunLoop();
   }
 
   virtual void OnChannelDenied() OVERRIDE {
     status_ = DENIED;
     if (!quit_only_on_message_) {
       QuitRunLoop();
     }
   }
 
   virtual void OnChannelListenError() OVERRIDE {
     status_ = LISTEN_ERROR;
     if (!quit_only_on_message_) {
       QuitRunLoop();
     }
   }
 
   STATUS status() { return status_; }
 
   void QuitRunLoop() {
-    base::MessageLoopForIO::current()->QuitNow();
+    base::MessageLoopForIO* loop = base::MessageLoopForIO::current();
+    if (loop->is_running()) {
+      loop->QuitNow();
+    } else {
+      // Die as soon as Run is called.
+      loop->PostTask(FROM_HERE, loop->QuitClosure());
+    }
   }
 
  private:
   // The current status of the listener.
   STATUS status_;
   // If |quit_only_on_message_| then the listener will only break out of
   // the run loop when kQuitMessage is received.
   bool quit_only_on_message_;
 };
 
@@ skipping 82 matching lines @@
   }
   handle->socket.fd = socket_fd;
 }
 
 void IPCChannelPosixTest::SpinRunLoop(base::TimeDelta delay) {
   base::MessageLoopForIO* loop = base::MessageLoopForIO::current();
   // Post a quit task so that this loop eventually ends and we don't hang
   // in the case of a bad test. Usually, the run loop will quit sooner than
   // that because all tests use a IPCChannelPosixTestListener which quits the
   // current run loop on any channel activity.
-  loop->PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(), delay);
+  loop->PostDelayedTask(FROM_HERE, loop->QuitClosure(), delay);
   loop->Run();
 }
 
 TEST_F(IPCChannelPosixTest, BasicListen) {
   const std::string kChannelName =
       GetChannelDirName() + "/IPCChannelPosixTest_BasicListen";
 
   // Test creating a socket that is listening.
   IPC::ChannelHandle handle(kChannelName);
   SetUpSocket(&handle, IPC::Channel::MODE_NAMED_SERVER);
@@ skipping 21 matching lines @@
   channel.Close();
   ASSERT_TRUE(IGNORE_EINTR(close(pipe_fds[1])) == 0);
 
   // Make sure that we can use the socket that is created for us by
   // a standard channel.
   IPC::Channel channel2(socket_name, IPC::Channel::MODE_SERVER, NULL);
   ASSERT_TRUE(channel2.Connect());
   ASSERT_FALSE(channel2.AcceptsConnections());
 }
 
+// If a connection closes right before a Send() call, we may end up closing
+// the connection without notifying the listener, which can cause hangs in
+// sync_message_filter and others. Make sure the listener is notified.
+TEST_F(IPCChannelPosixTest, SendHangTest) {
+  IPCChannelPosixTestListener out_listener(true);
+  IPCChannelPosixTestListener in_listener(true);
+  IPC::ChannelHandle in_handle("IN");
+  IPC::Channel in_chan(in_handle, IPC::Channel::MODE_SERVER, &in_listener);
+  base::FileDescriptor out_fd(in_chan.TakeClientFileDescriptor(), false);
+  IPC::ChannelHandle out_handle("OUT", out_fd);
+  IPC::Channel out_chan(out_handle, IPC::Channel::MODE_CLIENT, &out_listener);
+  ASSERT_TRUE(in_chan.Connect());
+  ASSERT_TRUE(out_chan.Connect());
+  in_chan.Close();  // simulate remote process dying at an unfortunate time.
+  // Send will fail, because it cannot write the message.
+  ASSERT_FALSE(out_chan.Send(new IPC::Message(
+      0,  // routing_id
+      kQuitMessage,  // message type
+      IPC::Message::PRIORITY_NORMAL)));
+  SpinRunLoop(TestTimeouts::action_max_timeout());
+  ASSERT_EQ(IPCChannelPosixTestListener::CHANNEL_ERROR, out_listener.status());
+}
+
+// If a connection closes right before a Connect() call, we may end up closing
+// the connection without notifying the listener, which can cause hangs in
+// sync_message_filter and others. Make sure the listener is notified.
+TEST_F(IPCChannelPosixTest, AcceptHangTest) {
+  IPCChannelPosixTestListener out_listener(true);
+  IPCChannelPosixTestListener in_listener(true);
+  IPC::ChannelHandle in_handle("IN");
+  IPC::Channel in_chan(in_handle, IPC::Channel::MODE_SERVER, &in_listener);
+  base::FileDescriptor out_fd(in_chan.TakeClientFileDescriptor(), false);
+  IPC::ChannelHandle out_handle("OUT", out_fd);
+  IPC::Channel out_chan(out_handle, IPC::Channel::MODE_CLIENT, &out_listener);
+  ASSERT_TRUE(in_chan.Connect());
+  in_chan.Close();  // simulate remote process dying at an unfortunate time.
+  ASSERT_FALSE(out_chan.Connect());
+  SpinRunLoop(TestTimeouts::action_max_timeout());
+  ASSERT_EQ(IPCChannelPosixTestListener::CHANNEL_ERROR, out_listener.status());
+}
+
 TEST_F(IPCChannelPosixTest, AdvancedConnected) {
   // Test creating a connection to an external process.
   IPCChannelPosixTestListener listener(false);
   IPC::ChannelHandle chan_handle(GetConnectionSocketName());
   SetUpSocket(&chan_handle, IPC::Channel::MODE_NAMED_SERVER);
   IPC::Channel channel(chan_handle, IPC::Channel::MODE_NAMED_SERVER, &listener);
   ASSERT_TRUE(channel.Connect());
   ASSERT_TRUE(channel.AcceptsConnections());
   ASSERT_FALSE(channel.HasAcceptedConnection());
 
@@ skipping 176 matching lines @@
   if (connected) {
     IPCChannelPosixTest::SpinRunLoop(TestTimeouts::action_max_timeout());
     EXPECT_EQ(IPCChannelPosixTestListener::CHANNEL_ERROR, listener.status());
   } else {
     EXPECT_EQ(IPCChannelPosixTestListener::DISCONNECTED, listener.status());
   }
   return 0;
 }
 
 }  // namespace