Merge IO v2 branch to bleeding edge

runtime/bin/socket.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 "bin/io_buffer.h"
 #include "bin/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 11 matching lines @@
 int Socket::service_ports_index_ = 0;
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   const char* host = DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
   int64_t port = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
     intptr_t socket = Socket::CreateConnect(host, port);
     if (socket >= 0) {
-      Socket::SetSocketIdNativeField(socket_obj, socket);
+      Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
+      if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       Dart_SetReturnValue(args, DartUtils::NewDartOSError());
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   intptr_t available = Socket::Available(socket);
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   intptr_t available = Socket::Available(socket);
   if (available > 0) {
     int64_t length = 0;
     Dart_Handle length_obj = Dart_GetNativeArgument(args, 1);
     if (DartUtils::GetInt64Value(length_obj, &length)) {
       if (length == -1 || available < length) {
         length = available;
       }
       uint8_t* buffer = NULL;
       Dart_Handle result = IOBuffer::Allocate(length, &buffer);
@@ skipping 26 matching lines @@
 
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_ReadList)(Dart_NativeArguments args) {
   Dart_EnterScope();
   static bool short_socket_reads = Dart_IsVMFlagSet("short_socket_read");
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   int64_t offset = 0;
   int64_t length = 0;
   Dart_Handle offset_obj = Dart_GetNativeArgument(args, 2);
   Dart_Handle length_obj = Dart_GetNativeArgument(args, 3);
   if (Dart_IsList(buffer_obj) &&
       DartUtils::GetInt64Value(offset_obj, &offset) &&
       DartUtils::GetInt64Value(length_obj, &length)) {
     intptr_t buffer_len = 0;
     Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
@@ skipping 29 matching lines @@
 
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
   Dart_EnterScope();
   static bool short_socket_writes = Dart_IsVMFlagSet("short_socket_write");
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   ASSERT(Dart_IsList(buffer_obj));
   intptr_t offset =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
   intptr_t length =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
   intptr_t buffer_len = 0;
   Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   ASSERT((offset + length) <= buffer_len);
 
   if (short_socket_writes) {
     length = (length + 1) / 2;
   }
 
   intptr_t total_bytes_written = 0;
   intptr_t bytes_written = 0;
   if (Dart_IsByteArrayExternal(buffer_obj)) {
     void* buffer = NULL;
     result = Dart_ExternalByteArrayGetData(buffer_obj, &buffer);
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
-    buffer = static_cast<void*>((static_cast<uint8_t*>(buffer) + offset));
+    buffer = static_cast<void*>(static_cast<uint8_t*>(buffer) + offset);
     bytes_written = Socket::Write(socket, buffer, length);
     if (bytes_written > 0) total_bytes_written = bytes_written;
   } else {
     // Send data in chunks of maximum 16KB.
     const intptr_t max_chunk_length =
         dart::Utils::Minimum(length, static_cast<intptr_t>(16 * KB));
     uint8_t* buffer = new uint8_t[max_chunk_length];
     do {
       intptr_t chunk_length =
           dart::Utils::Minimum(max_chunk_length, length - total_bytes_written);
@@ skipping 17 matching lines @@
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   OSError os_error;
   intptr_t port = Socket::GetPort(socket);
   if (port > 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(port));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   OSError os_error;
   intptr_t port = 0;
   char host[INET_ADDRSTRLEN];
   if (Socket::GetRemotePeer(socket, host, &port)) {
     Dart_Handle list = Dart_NewList(2);
     Dart_ListSetAt(list, 0, Dart_NewStringFromCString(host));
     Dart_ListSetAt(list, 1, Dart_NewInteger(port));
     Dart_SetReturnValue(args, list);
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   OSError os_error;
   Socket::GetError(socket, &os_error);
   Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
@@ skipping 10 matching lines @@
 }
 
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t num =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   ASSERT(num == 0 || num == 1 || num == 2);
   intptr_t socket = Socket::GetStdioHandle(num);
-  Socket::SetSocketIdNativeField(socket_obj, socket);
+  Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   Dart_Handle bind_address_obj = Dart_GetNativeArgument(args, 1);
   Dart_Handle port_obj = Dart_GetNativeArgument(args, 2);
   Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 3);
   int64_t port = 0;
   int64_t backlog = 0;
   if (Dart_IsString(bind_address_obj) &&
       DartUtils::GetInt64Value(port_obj, &port) &&
       DartUtils::GetInt64Value(backlog_obj, &backlog)) {
     const char* bind_address = DartUtils::GetStringValue(bind_address_obj);
     intptr_t socket =
         ServerSocket::CreateBindListen(bind_address, port, backlog);
     if (socket >= 0) {
-      Socket::SetSocketIdNativeField(socket_obj, socket);
+      Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
+      if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       if (socket == -5) {
         OSError os_error(-1, "Invalid host", OSError::kUnknown);
         Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
       } else {
         Dart_SetReturnValue(args, DartUtils::NewDartOSError());
       }
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_Handle result_socket_obj = Dart_GetNativeArgument(args, 1);
   intptr_t new_socket = ServerSocket::Accept(socket);
   if (new_socket >= 0) {
-    Socket::SetSocketIdNativeField(result_socket_obj, new_socket);
+    Dart_Handle err = Socket::SetSocketIdNativeField(result_socket_obj,
+                                                     new_socket);
+    if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, Dart_True());
   } else if (new_socket == ServerSocket::kTemporaryFailure) {
     Dart_SetReturnValue(args, Dart_False());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
@@ skipping 13 matching lines @@
     }
     return result;
   }
   return CObject::IllegalArgumentError();
 }
 
 
 void SocketService(Dart_Port dest_port_id,
                    Dart_Port reply_port_id,
                    Dart_CObject* message) {
-  CObject* response = CObject::False();
+  CObject* response = CObject::IllegalArgumentError();
   CObjectArray request(message);
   if (message->type == Dart_CObject::kArray) {
     if (request.Length() > 1 && request[0]->IsInt32()) {
       CObjectInt32 request_type(request[0]);
       switch (request_type.Value()) {
         case Socket::kLookupRequest:
           response = LookupRequest(request);
           break;
         default:
           UNREACHABLE();
@@ skipping 44 matching lines @@
 
 
 Dart_Handle Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
   return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
 }
 
 
 Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
   return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
 }