Fix double-closing of handles in Windows EventHandler.

runtime/bin/eventhandler_win.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.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/eventhandler.h"
 
 #include <winsock2.h>  // NOLINT
@@ skipping 370 matching lines @@
     EventHandlerImplementation* event_handler) {
   ScopedLock lock(this);
   event_handler_ = event_handler;
   if (completion_port_ == INVALID_HANDLE_VALUE) {
     CreateCompletionPort(event_handler_->completion_port());
   }
 }
 
 
 bool DirectoryWatchHandle::IsClosed() {
-  return IsClosing() && pending_read_ == NULL;
+  return IsClosing() && pending_read_ == NULL && closed_;
+}
+

[kasperl, 2014/06/04 11:37:54]

Extra newline here.

+void DirectoryWatchHandle::DoClose() {
+  if (handle_ != INVALID_HANDLE_VALUE) {
+    Handle::DoClose();
+  }
+  closed_ = true;
 }
 
 
 bool DirectoryWatchHandle::IssueRead() {
   ScopedLock lock(this);
   // It may have been started before, as we start the directory-handler when
   // we create it.
   if (pending_read_ != NULL) return true;
   OverlappedBuffer* buffer = OverlappedBuffer::AllocateReadBuffer(kBufferSize);
   ASSERT(completion_port_ != INVALID_HANDLE_VALUE);
@@ skipping 15 matching lines @@
 }
 
 
 void DirectoryWatchHandle::Stop() {
   ScopedLock lock(this);
   // Stop the outstanding read, so we can close the handle.
 
   if (pending_read_ != NULL) {
     CancelIoEx(handle(), pending_read_->GetCleanOverlapped());
     // Don't dispose of the buffer, as it will still complete (with length 0).
-    pending_read_ = NULL;
   }
 
-  CloseHandle(handle());
-  handle_ = (INVALID_HANDLE_VALUE);
+  // Close handle, but don't mark as closed_.

[kasperl, 2014/06/04 11:37:54]

closed_ -> closed.

+  MarkClosing();
+  Handle::DoClose();
 }
 
 
 void SocketHandle::HandleIssueError() {
   int error = WSAGetLastError();
   if (error == WSAECONNRESET) {
     HandleClosed(this);
   } else {
     HandleError(this);
   }
@@ skipping 921 matching lines @@
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)