Merge services into a shared IOService in dart:io, and use a native port.

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 335 matching lines @@
     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());
   }
 }
 
 
-static CObject* LookupRequest(const CObjectArray& request) {
-  if (request.Length() == 3 &&
-      request[1]->IsString() &&
-      request[2]->IsInt32()) {
-    CObjectString host(request[1]);
-    CObjectInt32 type(request[2]);
+CObject* Socket::LookupRequest(const CObjectArray& request) {
+  if (request.Length() == 2 &&
+      request[0]->IsString() &&
+      request[1]->IsInt32()) {
+    CObjectString host(request[0]);
+    CObjectInt32 type(request[1]);
     CObject* result = NULL;
     OSError* os_error = NULL;
     AddressList<SocketAddress>* addresses =
         Socket::LookupAddress(host.CString(), type.Value(), &os_error);
     if (addresses != NULL) {
       CObjectArray* array = new CObjectArray(
           CObject::NewArray(addresses->count() + 1));
       array->SetAt(0, new CObjectInt32(CObject::NewInt32(0)));
       for (intptr_t i = 0; i < addresses->count(); i++) {
         SocketAddress* addr = addresses->GetAt(i);
@@ skipping 22 matching lines @@
     } else {
       result = CObject::NewOSError(os_error);
       delete os_error;
     }
     return result;
   }
   return CObject::IllegalArgumentError();
 }
 
 
-static CObject* ReverseLookupRequest(const CObjectArray& request) {
-  if (request.Length() == 2 &&
-      request[1]->IsTypedData()) {
-    CObjectUint8Array addr_object(request[1]);
+CObject* Socket::ReverseLookupRequest(const CObjectArray& request) {
+  if (request.Length() == 1 &&
+      request[0]->IsTypedData()) {
+    CObjectUint8Array addr_object(request[0]);
     RawAddr addr;
     memmove(reinterpret_cast<void *>(&addr),
             addr_object.Buffer(),
             addr_object.Length());
     OSError* os_error = NULL;
     const intptr_t kMaxHostLength = 1025;
     char host[kMaxHostLength];
     if (Socket::ReverseLookup(addr, host, kMaxHostLength, &os_error)) {
       return new CObjectString(CObject::NewString(host));
     } else {
       CObject* result = CObject::NewOSError(os_error);
       delete os_error;
       return result;
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 
-static CObject* ListInterfacesRequest(const CObjectArray& request) {
-  if (request.Length() == 2 &&
-      request[1]->IsInt32()) {
-    CObjectInt32 type(request[1]);
+CObject* Socket::ListInterfacesRequest(const CObjectArray& request) {
+  if (request.Length() == 1 &&
+      request[0]->IsInt32()) {
+    CObjectInt32 type(request[0]);
     CObject* result = NULL;
     OSError* os_error = NULL;
     AddressList<InterfaceSocketAddress>* addresses = Socket::ListInterfaces(
         type.Value(), &os_error);
     if (addresses != NULL) {
       CObjectArray* array = new CObjectArray(
           CObject::NewArray(addresses->count() + 1));
       array->SetAt(0, new CObjectInt32(CObject::NewInt32(0)));
       for (intptr_t i = 0; i < addresses->count(); i++) {
         InterfaceSocketAddress* interface = addresses->GetAt(i);
@@ skipping 27 matching lines @@
     } else {
       result = CObject::NewOSError(os_error);
       delete os_error;
     }
     return result;
   }
   return CObject::IllegalArgumentError();
 }
 
 
-void SocketService(Dart_Port dest_port_id,
-                   Dart_Port reply_port_id,
-                   Dart_CObject* message) {
-  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;
-        case Socket::kListInterfacesRequest:
-          response = ListInterfacesRequest(request);
-          break;
-        case Socket::kReverseLookupRequest:
-          response = ReverseLookupRequest(request);
-          break;
-        default:
-          UNREACHABLE();
-      }
-    }
-  }
-
-  Dart_PostCObject(reply_port_id, response->AsApiCObject());
-}
-
-
-Dart_Port Socket::GetServicePort() {
-  MutexLocker lock(mutex_);
-  if (service_ports_size_ == 0) {
-    ASSERT(service_ports_ == NULL);
-    service_ports_size_ = 16;
-    service_ports_ = new Dart_Port[service_ports_size_];
-    service_ports_index_ = 0;
-    for (int i = 0; i < service_ports_size_; i++) {
-      service_ports_[i] = ILLEGAL_PORT;
-    }
-  }
-
-  Dart_Port result = service_ports_[service_ports_index_];
-  if (result == ILLEGAL_PORT) {
-    result = Dart_NewNativePort("SocketService",
-                                SocketService,
-                                true);
-    ASSERT(result != ILLEGAL_PORT);
-    service_ports_[service_ports_index_] = result;
-  }
-  service_ports_index_ = (service_ports_index_ + 1) % service_ports_size_;
-  return result;
-}
-
-
-void FUNCTION_NAME(Socket_NewServicePort)(Dart_NativeArguments args) {
-  Dart_SetReturnValue(args, Dart_Null());
-  Dart_Port service_port = Socket::GetServicePort();
-  if (service_port != ILLEGAL_PORT) {
-    // Return a send port for the service port.
-    Dart_Handle send_port = Dart_NewSendPort(service_port);
-    Dart_SetReturnValue(args, send_port);
-  }
-}
-
-
 void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t socket = 0;
   bool result = false;
   Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
   if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_Handle option_obj = Dart_GetNativeArgument(args, 1);
   int64_t option;
   err = Dart_IntegerToInt64(option_obj, &option);
   if (Dart_IsError(err)) Dart_PropagateError(err);
@@ skipping 16 matching lines @@
   return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
 }
 
 
 Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
   return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
 }
 
 }  // namespace bin
 }  // namespace dart