Fix file descriptor leak in event handler implementation. When shutting down an isolate, we did not…

runtime/bin/eventhandler_win.cc

 // Copyright (c) 2012, 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
@@ skipping 871 matching lines @@
       CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, NULL, 1);
   if (completion_port_ == NULL) {
     FATAL("Completion port creation failed");
   }
   timeout_ = kInfinityTimeout;
   timeout_port_ = 0;
   shutdown_ = false;
 }
 
 
+EventHandlerImplementation::~EventHandlerImplementation() {
+  CloseHandle(completion_port_);
+}
+
+
 DWORD EventHandlerImplementation::GetTimeout() {
   if (timeout_ == kInfinityTimeout) {
     return kInfinityTimeout;
   }
   intptr_t millis = timeout_ - TimerUtils::GetCurrentTimeMilliseconds();
   return (millis < 0) ? 0 : millis;
 }
 
 
 void EventHandlerImplementation::SendData(intptr_t id,
                                           Dart_Port dart_port,
                                           int64_t data) {
   InterruptMessage* msg = new InterruptMessage;
   msg->id = id;
   msg->dart_port = dart_port;
   msg->data = data;
   BOOL ok = PostQueuedCompletionStatus(
       completion_port_, 0, NULL, reinterpret_cast<OVERLAPPED*>(msg));
   if (!ok) {
     FATAL("PostQueuedCompletionStatus failed");
   }
 }
 
 
 void EventHandlerImplementation::EventHandlerEntry(uword args) {
-  EventHandlerImplementation* handler =
-      reinterpret_cast<EventHandlerImplementation*>(args);
-  ASSERT(handler != NULL);
-  while (!handler->shutdown_) {
+  EventHandler* handler = reinterpret_cast<EventHandler*>(args);
+  EventHandlerImplementation* handler_impl = &handler->delegate_;
+  ASSERT(handler_impl != NULL);
+  while (!handler_impl->shutdown_) {
     DWORD bytes;
     ULONG_PTR key;
     OVERLAPPED* overlapped;
-    intptr_t millis = handler->GetTimeout();
-    BOOL ok = GetQueuedCompletionStatus(handler->completion_port(),
+    intptr_t millis = handler_impl->GetTimeout();
+    BOOL ok = GetQueuedCompletionStatus(handler_impl->completion_port(),
                                         &bytes,
                                         &key,
                                         &overlapped,
                                         millis);
     if (!ok && overlapped == NULL) {
       if (GetLastError() == ERROR_ABANDONED_WAIT_0) {
         // The completion port should never be closed.
         Log::Print("Completion port closed\n");
         UNREACHABLE();
       } else {
         // Timeout is signalled by false result and NULL in overlapped.
-        handler->HandleTimeout();
+        handler_impl->HandleTimeout();
       }
     } else if (!ok) {
       // Treat ERROR_CONNECTION_ABORTED as connection closed.
       // The error ERROR_OPERATION_ABORTED is set for pending
       // accept requests for a listen socket which is closed.
       // ERROR_NETNAME_DELETED occurs when the client closes
       // the socket it is reading from.
       DWORD last_error = GetLastError();
       if (last_error == ERROR_CONNECTION_ABORTED ||
           last_error == ERROR_OPERATION_ABORTED ||
           last_error == ERROR_NETNAME_DELETED ||
           last_error == ERROR_BROKEN_PIPE) {
         ASSERT(bytes == 0);
-        handler->HandleIOCompletion(bytes, key, overlapped);
+        handler_impl->HandleIOCompletion(bytes, key, overlapped);
       } else {
         ASSERT(bytes == 0);
-        handler->HandleIOCompletion(-1, key, overlapped);
+        handler_impl->HandleIOCompletion(-1, key, overlapped);
       }
     } else if (key == NULL) {
       // A key of NULL signals an interrupt message.
       InterruptMessage* msg = reinterpret_cast<InterruptMessage*>(overlapped);
-      handler->HandleInterrupt(msg);
+      handler_impl->HandleInterrupt(msg);
       delete msg;
     } else {
-      handler->HandleIOCompletion(bytes, key, overlapped);
+      handler_impl->HandleIOCompletion(bytes, key, overlapped);
     }
   }
+  delete handler;
 }
 
 
-void EventHandlerImplementation::Start() {
+void EventHandlerImplementation::Start(EventHandler* handler) {
   int result = dart::Thread::Start(EventHandlerEntry,
-                                   reinterpret_cast<uword>(this));
+                                   reinterpret_cast<uword>(handler));
   if (result != 0) {
     FATAL1("Failed to start event handler thread %d", result);
   }
 
   // Initialize Winsock32
   if (!Socket::Initialize()) {
     FATAL("Failed to initialized Windows sockets");
   }
 }
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 #endif  // defined(TARGET_OS_WINDOWS)