Keep track of when a socket has been destroyed

runtime/bin/eventhandler_win.cc

-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// 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.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/eventhandler.h"
 
 #include <process.h>  // NOLINT
 #include <winsock2.h>  // NOLINT
@@ skipping 305 matching lines @@
 void FileHandle::EnsureInitialized(EventHandlerImplementation* event_handler) {
   ScopedLock lock(this);
   event_handler_ = event_handler;
   if (SupportsOverlappedIO() && completion_port_ == INVALID_HANDLE_VALUE) {
     CreateCompletionPort(event_handler_->completion_port());
   }
 }
 
 
 bool FileHandle::IsClosed() {
-  return false;
+  return IsClosing();
 }
 
 
 void FileHandle::DoClose() {
   if (GetStdHandle(STD_OUTPUT_HANDLE) == handle_) {
     int fd = _open("NUL", _O_WRONLY);
     ASSERT(fd >= 0);
     _dup2(fd, _fileno(stdout));
     close(fd);
   } else {
@@ skipping 228 matching lines @@
   if (how == SD_RECEIVE) MarkClosedRead();
   if (how == SD_SEND) MarkClosedWrite();
   if (how == SD_BOTH) {
     MarkClosedRead();
     MarkClosedWrite();
   }
 }
 
 
 void ClientSocket::DoClose() {
-  // Always do a suhtdown before initiating a disconnect.
+  // Always do a shutdown before initiating a disconnect.
   shutdown(socket(), SD_BOTH);
   IssueDisconnect();
 }
 
 
 bool ClientSocket::IssueRead() {
   ScopedLock lock(this);
   ASSERT(completion_port_ != INVALID_HANDLE_VALUE);
   ASSERT(pending_read_ == NULL);
 
@@ skipping 36 matching lines @@
     return true;
   }
   IOBuffer::DisposeBuffer(pending_write_);
   pending_write_ = NULL;
   HandleIssueError();
   return false;
 }
 
 
 void ClientSocket::IssueDisconnect() {
+  Dart_Port p = port();
   IOBuffer* buffer = IOBuffer::AllocateDisconnectBuffer();
   BOOL ok = DisconnectEx_(
     socket(), buffer->GetCleanOverlapped(), TF_REUSE_SOCKET, 0);
   if (!ok && WSAGetLastError() != WSA_IO_PENDING) {
     DisconnectComplete(buffer);
   }
+  if (p != ILLEGAL_PORT) DartUtils::PostInt32(p, 1 << kDestroyedEvent);
 }
 
 
 void ClientSocket::DisconnectComplete(IOBuffer* buffer) {
   IOBuffer::DisposeBuffer(buffer);
   closesocket(socket());
   if (data_ready_ != NULL) {
     IOBuffer::DisposeBuffer(data_ready_);
   }
   // When disconnect is complete get rid of the object.
@@ skipping 10 matching lines @@
     CreateCompletionPort(event_handler_->completion_port());
   }
 }
 
 
 bool ClientSocket::IsClosed() {
   return false;
 }
 
 
+static void DeleteIfClosed(Handle* handle) {
+  if (handle->IsClosed()) {
+    Dart_Port port = handle->port();
+    delete handle;
+    DartUtils::PostInt32(port, 1 << kDestroyedEvent);
+  }
+}
+
+
 void EventHandlerImplementation::HandleInterrupt(InterruptMessage* msg) {
   if (msg->id == kTimeoutId) {
     // Change of timeout request. Just set the new timeout and port as the
     // completion thread will use the new timeout value for its next wait.
     timeout_queue_.UpdateTimeout(msg->dart_port, msg->data);
   } else if (msg->id == kShutdownId) {
     shutdown_ = true;
   } else {
     bool delete_handle = false;

[kustermann, 2013/07/19 11:59:18]

Remove that boolean.

[Anders Johnsen, 2013/07/19 13:25:58]

Done.

     Handle* handle = reinterpret_cast<Handle*>(msg->id);
     ASSERT(handle != NULL);
     if (handle->is_listen_socket()) {
       ListenSocket* listen_socket =
           reinterpret_cast<ListenSocket*>(handle);
       listen_socket->EnsureInitialized(this);
       listen_socket->SetPortAndMask(msg->dart_port, msg->data);
 
       Handle::ScopedLock lock(listen_socket);
 
       // If incomming connections are requested make sure to post already
       // accepted connections.
       if ((msg->data & (1 << kInEvent)) != 0) {
         if (listen_socket->CanAccept()) {
           int event_mask = (1 << kInEvent);
           handle->set_mask(handle->mask() & ~event_mask);
           DartUtils::PostInt32(handle->port(), event_mask);
         }
         // Always keep 5 outstanding accepts going, to enhance performance.
         while (listen_socket->pending_accept_count() < 5) {
           listen_socket->IssueAccept();
         }
       }
 
       if ((msg->data & (1 << kCloseCommand)) != 0) {
         listen_socket->Close();
         if (listen_socket->IsClosed()) {
           delete_handle = true;
         }

[kustermann, 2013/07/19 11:59:18]

remove this.

[Anders Johnsen, 2013/07/19 13:25:58]

Done.

       }
     } else {
       handle->EnsureInitialized(this);
 
       Handle::ScopedLock lock(handle);
 
       if (!handle->IsError()) {
         if ((msg->data & ((1 << kInEvent) | (1 << kOutEvent))) != 0) {
           // Only set mask if we turned on kInEvent or kOutEvent.
           handle->SetPortAndMask(msg->dart_port, msg->data);
@@ skipping 32 matching lines @@
             client_socket->Shutdown(SD_RECEIVE);
           }
 
           if ((msg->data & (1 << kShutdownWriteCommand)) != 0) {
             client_socket->Shutdown(SD_SEND);
           }
         }
       }
 
       if ((msg->data & (1 << kCloseCommand)) != 0) {
+        handle->SetPortAndMask(msg->dart_port, msg->data);
         handle->Close();
         if (handle->IsClosed()) {
           delete_handle = true;

[kustermann, 2013/07/19 11:59:18]

remove this.

[Anders Johnsen, 2013/07/19 13:25:58]

Done.

         }
       }
     }
     if (delete_handle) {
-      delete handle;
+      DeleteIfClosed(handle);

[kustermann, 2013/07/19 11:59:18]

Remove the condition.

[Anders Johnsen, 2013/07/19 13:25:58]

Done.

     }
   }
 }
 
 
 void EventHandlerImplementation::HandleAccept(ListenSocket* listen_socket,
                                               IOBuffer* buffer) {
   listen_socket->AcceptComplete(buffer, completion_port_);
 
   if (!listen_socket->IsClosing()) {
     int event_mask = 1 << kInEvent;
     if ((listen_socket->mask() & event_mask) != 0) {
       DartUtils::PostInt32(listen_socket->port(), event_mask);
     }
   }
 
-  if (listen_socket->IsClosed()) {
-    delete listen_socket;
-  }
+  DeleteIfClosed(listen_socket);
 }
 
 
 void EventHandlerImplementation::HandleClosed(Handle* handle) {
   if (!handle->IsClosing()) {
     int event_mask = 1 << kCloseEvent;
     DartUtils::PostInt32(handle->port(), event_mask);
   }
 }
 
@@ skipping 22 matching lines @@
     }
   } else {
     handle->MarkClosedRead();
     if (bytes == 0) {
       HandleClosed(handle);
     } else {
       HandleError(handle);
     }
   }
 
-  if (handle->IsClosed()) {
-    delete handle;
-  }
+  DeleteIfClosed(handle);
 }
 
 
 void EventHandlerImplementation::HandleWrite(Handle* handle,
                                              int bytes,
                                              IOBuffer* buffer) {
   handle->WriteComplete(buffer);
 
   if (bytes > 0) {
     if (!handle->IsError() && !handle->IsClosing()) {
       int event_mask = 1 << kOutEvent;
       if ((handle->mask() & event_mask) != 0) {
         DartUtils::PostInt32(handle->port(), event_mask);
       }
     }
   } else if (bytes == 0) {
     HandleClosed(handle);
   } else {
     HandleError(handle);
   }
 
-  if (handle->IsClosed()) {
-    delete handle;
-  }
+  DeleteIfClosed(handle);
 }
 
 
 void EventHandlerImplementation::HandleDisconnect(
     ClientSocket* client_socket,
     int bytes,
     IOBuffer* buffer) {
   client_socket->DisconnectComplete(buffer);
 }
 
@@ skipping 147 matching lines @@
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)