Revert: Fixes memory leaks in the eventhandler

runtime/bin/socket.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #if !defined(DART_IO_DISABLED)
 
 #include "bin/socket.h"
 
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
@@ skipping 109 matching lines @@
   sockets_by_port_[allocated_port] = os_socket;
   sockets_by_fd_[socketfd] = os_socket;
 
   // We set as a side-effect the port on the dart socket_object.
   Socket::SetSocketIdNativeField(socket_object, socketfd);
 
   return Dart_True();
 }
 
 
-bool ListeningSocketRegistry::CloseOneSafe(OSSocket* os_socket) {
-  ASSERT(!mutex_->TryLock());
-  ASSERT(os_socket != NULL);
-  ASSERT(os_socket->ref_count > 0);
-  os_socket->ref_count--;
-  if (os_socket->ref_count > 0) {
-    return false;
-  }
-  // We free the OS socket by removing it from two datastructures.
-  sockets_by_fd_.erase(os_socket->socketfd);
-
-  OSSocket *prev = NULL;
-  OSSocket *current = sockets_by_port_[os_socket->port];
-  while (current != os_socket) {
-    ASSERT(current != NULL);
-    prev = current;
-    current = current->next;
-  }
-
-  if ((prev == NULL) && (current->next == NULL)) {
-    // Remove last element from the list.
-    sockets_by_port_.erase(os_socket->port);
-  } else if (prev == NULL) {
-    // Remove first element of the list.
-    sockets_by_port_[os_socket->port] = current->next;
-  } else {
-    // Remove element from the list which is not the first one.
-    prev->next = os_socket->next;
-  }
-
-  ASSERT(os_socket->ref_count == 0);
-  delete os_socket;
-  return true;
-}
-
-
-void ListeningSocketRegistry::CloseAllSafe() {
-  MutexLocker ml(mutex_);
-  SocketsIterator it = sockets_by_fd_.begin();
-  while (it != sockets_by_fd_.end()) {
-    CloseOneSafe(it->second);
-    it++;
-  }
-}
-
-
 bool ListeningSocketRegistry::CloseSafe(intptr_t socketfd) {
   ASSERT(!mutex_->TryLock());
+
   SocketsIterator it = sockets_by_fd_.find(socketfd);
   if (it != sockets_by_fd_.end()) {
-    return CloseOneSafe(it->second);
+    OSSocket *os_socket = it->second;
+
+    ASSERT(os_socket->ref_count > 0);
+    os_socket->ref_count--;
+    if (os_socket->ref_count == 0) {
+      // We free the OS socket by removing it from two datastructures.
+      sockets_by_fd_.erase(socketfd);
+
+      OSSocket *prev = NULL;
+      OSSocket *current = sockets_by_port_[os_socket->port];
+      while (current != os_socket) {
+        ASSERT(current != NULL);
+        prev = current;
+        current = current->next;
+      }
+
+      if ((prev == NULL) && (current->next == NULL)) {
+        // Remove last element from the list.
+        sockets_by_port_.erase(os_socket->port);
+      } else if (prev == NULL) {
+        // Remove first element of the list.
+        sockets_by_port_[os_socket->port] = current->next;
+      } else {
+        // Remove element from the list which is not the first one.
+        prev->next = os_socket->next;
+      }
+
+      delete os_socket;
+      return true;
+    }
+    return false;
   } else {
     // It should be impossible for the event handler to close something that
     // hasn't been created before.
     UNREACHABLE();
     return false;
   }
 }
 
 
 void FUNCTION_NAME(InternetAddress_Parse)(Dart_NativeArguments args) {
@@ skipping 707 matching lines @@
   if (Dart_IsError(err)) {
     Dart_PropagateError(err);
   }
   return socket;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // !defined(DART_IO_DISABLED)