Increase the datagram receive buffer on Windows to 64k

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 "bin/eventhandler_win.h"
 
@@ skipping 971 matching lines @@
   HandleIssueError();
   return false;
 }
 
 
 bool DatagramSocket::IssueRecvFrom() {
   MonitorLocker ml(monitor_);
   ASSERT(completion_port_ != INVALID_HANDLE_VALUE);
   ASSERT(pending_read_ == NULL);
 
-  OverlappedBuffer* buffer = OverlappedBuffer::AllocateRecvFromBuffer(1024);
+  OverlappedBuffer* buffer =
+      OverlappedBuffer::AllocateRecvFromBuffer(64 * 1024);

[kustermann, 2015/10/02 15:36:58]

Maybe make a constant kMaxUDPPackageLength ?

[Theoretically they can actually be bigger: https://tools.ietf.org/html/rfc2675]

[Søren Gjesse, 2015/10/06 07:01:42]

Added a constant and mentioned the current limit in the dartdoc for receive.

 
   DWORD flags;
   flags = 0;
   int rc = WSARecvFrom(socket(),
                        buffer->GetWASBUF(),
                        1,
                        NULL,
                        &flags,
                        buffer->from(),
                        buffer->from_len_addr(),
@@ skipping 202 matching lines @@
   }
 
   DeleteIfClosed(handle);
 }
 
 
 void EventHandlerImplementation::HandleRecvFrom(Handle* handle,
                                                 int bytes,
                                                 OverlappedBuffer* buffer) {
   ASSERT(handle->is_datagram_socket());
-  buffer->set_data_length(bytes);
-  handle->ReadComplete(buffer);
-  if (!handle->IsClosing()) {
-    int event_mask = 1 << kInEvent;
-    if ((handle->Mask() & event_mask) != 0) {
+  if (bytes >= 0) {
+    buffer->set_data_length(bytes);
+    handle->ReadComplete(buffer);
+    if (!handle->IsClosing()) {
+      int event_mask = 1 << kInEvent;
+      if ((handle->Mask() & event_mask) != 0) {
         Dart_Port port = handle->NextNotifyDartPort(event_mask);
-      DartUtils::PostInt32(port, event_mask);
+        DartUtils::PostInt32(port, event_mask);
+      }
     }
+  } else {
+    HandleError(handle);

[kustermann, 2015/10/02 15:36:58]

Is there a way to test that we report the error to Dart?

[Søren Gjesse, 2015/10/06 07:01:42]

I have not found one. I did a manual test with the small constant and received
the ERROR_MORE_DATA in Dart.

   }
 
+

[kustermann, 2015/10/02 15:36:58]

extra empty line

[Søren Gjesse, 2015/10/06 07:01:42]

Removed.

   DeleteIfClosed(handle);
 }
 
 
 void EventHandlerImplementation::HandleWrite(Handle* handle,
                                              int bytes,
                                              OverlappedBuffer* buffer) {
   handle->WriteComplete(buffer);
 
   if (bytes >= 0) {
@@ skipping 171 matching lines @@
       // 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_impl->HandleIOCompletion(bytes, key, overlapped);
+      } else if (last_error == ERROR_MORE_DATA) {
+        // Don't ASSERT no bytes in this case. This can happen if the receive
+        // buffer for datagram sockets is to small to contain a full datagram,
+        // and in this case bytes hold the bytes that was read.
+        handler_impl->HandleIOCompletion(-1, key, overlapped);
       } else {
         ASSERT(bytes == 0);
         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_impl->HandleInterrupt(msg);
       delete msg;
     } else {
@@ skipping 26 matching lines @@
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)