Clean up 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 314 matching lines @@
   HandleIssueError();
   return false;
 }
 
 
 bool Handle::IssueSendTo(struct sockaddr* sa, socklen_t sa_len) {
   return false;
 }
 
 
+static void HandleClosed(Handle* handle) {
+  if (!handle->IsClosing()) {
+    int event_mask = 1 << kCloseEvent;
+    DartUtils::PostInt32(handle->port(), event_mask);
+  }
+}
+
+
+static void HandleError(Handle* handle) {
+  handle->set_last_error(WSAGetLastError());
+  handle->MarkError();
+  if (!handle->IsClosing()) {
+    int event_mask = 1 << kErrorEvent;
+    DartUtils::PostInt32(handle->port(), event_mask);
+  }
+}
+
+
 void Handle::HandleIssueError() {
   DWORD error = GetLastError();
-  ASSERT(event_handler_ != NULL);
   if (error == ERROR_BROKEN_PIPE) {
-    event_handler_->HandleClosed(this);
+    HandleClosed(this);
   } else {
-    event_handler_->HandleError(this);
+    HandleError(this);
   }
   SetLastError(error);
 }
 
 
 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());
@@ skipping 41 matching lines @@
     pending_read_ = buffer;
     return true;
   }
   OverlappedBuffer::DisposeBuffer(buffer);
   return false;
 }
 
 
 void SocketHandle::HandleIssueError() {
   int error = WSAGetLastError();
-  ASSERT(event_handler_ != NULL);
   if (error == WSAECONNRESET) {
-    event_handler_->HandleClosed(this);
+    HandleClosed(this);
   } else {
-    event_handler_->HandleError(this);
+    HandleError(this);
   }
   WSASetLastError(error);
 }
 
 
 bool ListenSocket::LoadAcceptEx() {
   // Load the AcceptEx function into memory using WSAIoctl.
   GUID guid_accept_ex = WSAID_ACCEPTEX;
   DWORD bytes;
   int status = WSAIoctl(socket(),
@@ skipping 122 matching lines @@
 ClientSocket* ListenSocket::Accept() {
   ScopedLock lock(this);
   if (accepted_head_ == NULL) return NULL;
   ClientSocket* result = accepted_head_;
   accepted_head_ = accepted_head_->next();
   if (accepted_head_ == NULL) accepted_tail_ = NULL;
   result->set_next(NULL);
   if (!IsClosing()) {
     while (pending_accept_count() < 5) {
       if (!IssueAccept()) {
-        event_handler_->HandleError(this);
+        HandleError(this);
       }
     }
   }
   return result;
 }
 
 
 void ListenSocket::EnsureInitialized(
     EventHandlerImplementation* event_handler) {
   ScopedLock lock(this);
@@ skipping 514 matching lines @@
     int event_mask = 1 << kInEvent;
     if ((listen_socket->mask() & event_mask) != 0) {
       DartUtils::PostInt32(listen_socket->port(), event_mask);
     }
   }
 
   DeleteIfClosed(listen_socket);
 }
 
 
-void EventHandlerImplementation::HandleClosed(Handle* handle) {
-  if (!handle->IsClosing()) {
-    int event_mask = 1 << kCloseEvent;
-    DartUtils::PostInt32(handle->port(), event_mask);
-  }
-}
-
-
-void EventHandlerImplementation::HandleError(Handle* handle) {
-  handle->set_last_error(WSAGetLastError());
-  handle->MarkError();
-  if (!handle->IsClosing()) {
-    int event_mask = 1 << kErrorEvent;
-    DartUtils::PostInt32(handle->port(), event_mask);
-  }
-}
-
-
 void EventHandlerImplementation::HandleRead(Handle* handle,
                                             int bytes,
                                             OverlappedBuffer* buffer) {
   buffer->set_data_length(bytes);
   handle->ReadComplete(buffer);
   if (bytes > 0) {
     if (!handle->IsClosing()) {
       int event_mask = 1 << kInEvent;
       if ((handle->mask() & event_mask) != 0) {
         DartUtils::PostInt32(handle->port(), event_mask);
@@ skipping 235 matching lines @@
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)