Stop watching the netlink file descriptor before the message pump is destroye...

net/base/network_change_notifier_linux.cc

 // Copyright (c) 2009 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.
 
 #include "net/base/network_change_notifier_linux.h"
 
 #include <errno.h>
 #include <sys/socket.h>
 
 #include "base/basictypes.h"
+#include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier_netlink_linux.h"
 
 namespace net {
 
 namespace {
 
 const int kInvalidSocket = -1;
 
 }  // namespace
 
 NetworkChangeNotifierLinux::NetworkChangeNotifierLinux()
     : netlink_fd_(kInvalidSocket),
       loop_(MessageLoopForIO::current()) {
   netlink_fd_ = InitializeNetlinkSocket();
   if (netlink_fd_ < 0) {
     netlink_fd_ = kInvalidSocket;
     return;
   }
 
   ListenForNotifications();
+  loop_->AddDestructionObserver(this);
 }
 
 NetworkChangeNotifierLinux::~NetworkChangeNotifierLinux() {
-  if (netlink_fd_ != kInvalidSocket) {
-    if (close(netlink_fd_) != 0)
-      PLOG(ERROR) << "Failed to close socket";
-    netlink_fd_ = kInvalidSocket;
-    netlink_watcher_.StopWatchingFileDescriptor();
-  }
+  StopWatching();
+
+  if (loop_)
+    loop_->RemoveDestructionObserver(this);
 }
 
 void NetworkChangeNotifierLinux::OnFileCanReadWithoutBlocking(int fd) {
   DCHECK_EQ(fd, netlink_fd_);
 
   ListenForNotifications();
 }
 
 void NetworkChangeNotifierLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {
   NOTREACHED();
 }
 
+void NetworkChangeNotifierLinux::WillDestroyCurrentMessageLoop() {
+  StopWatching();
+  loop_ = NULL;
+}
+
 void NetworkChangeNotifierLinux::ListenForNotifications() {
   char buf[4096];
   int rv = ReadNotificationMessage(buf, arraysize(buf));
   while (rv > 0 ) {
     if (HandleNetlinkMessage(buf, rv))
       FOR_EACH_OBSERVER(Observer, observers_, OnIPAddressChanged());
     rv = ReadNotificationMessage(buf, arraysize(buf));
   }
 
   if (rv == ERR_IO_PENDING) {
@@ skipping 16 matching lines @@
     DCHECK_NE(rv, 0);
     if (errno != EAGAIN && errno != EWOULDBLOCK) {
       PLOG(DFATAL) << "recv";
       return ERR_FAILED;
     }
 
     return ERR_IO_PENDING;
   }
 }
 
+void NetworkChangeNotifierLinux::StopWatching() {
+  if (netlink_fd_ != kInvalidSocket) {
+    if (HANDLE_EINTR(close(netlink_fd_)) != 0)
+      PLOG(ERROR) << "Failed to close socket";
+    netlink_fd_ = kInvalidSocket;
+    netlink_watcher_.StopWatchingFileDescriptor();
+  }
+}
+
 }  // namespace net