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

runtime/bin/socket_patch.dart

 // 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.
 
 patch class RawServerSocket {
   /* patch */ static Future<RawServerSocket> bind(address,
                                                   int port,
                                                   {int backlog: 0,
                                                    bool v6Only: false}) {
     return _RawServerSocket.bind(address, port, backlog, v6Only);
@@ skipping 202 matching lines @@
 
   // The type flags for this socket.
   final int typeFlags;
 
   // Holds the port of the socket, null if not known.
   int localPort;
 
   // Holds the address used to connect or bind the socket.
   InternetAddress address;
 
-  // Native port for socket services.
-  static SendPort socketService;
-
   static Future<List<InternetAddress>> lookup(
       String host, {InternetAddressType type: InternetAddressType.ANY}) {
-    ensureSocketService();
-    return socketService.call([HOST_NAME_LOOKUP, host, type._value])
+    return IOService.dispatch(SOCKET_LOOKUP, [host, type._value])
         .then((response) {
           if (isErrorResponse(response)) {
             throw createError(response, "Failed host lookup: '$host'");
           } else {
             return response.skip(1).map((result) {
               var type = new InternetAddressType._from(result[0]);
               return new _InternetAddress(type, result[1], host, result[2]);
             }).toList();
           }
         });
   }
 
   static Future<InternetAddress> reverseLookup(InternetAddress addr) {
-    ensureSocketService();
-    return socketService.call([REVERSE_LOOKUP, addr._sockaddr_storage])
+    return IOService.dispatch(SOCKET_REVERSE_LOOKUP, [addr._sockaddr_storage])
         .then((response) {
           if (isErrorResponse(response)) {
             throw createError(response, "Failed reverse host lookup", addr);
           } else {
             return addr._cloneWithNewHost(response);
           }
         });
   }
 
   static Future<List<NetworkInterface>> listInterfaces({
       bool includeLoopback: false,
       bool includeLinkLocal: false,
       InternetAddressType type: InternetAddressType.ANY}) {
-    ensureSocketService();
-    return socketService.call([LIST_INTERFACES, type._value])
+    return IOService.dispatch(SOCKET_LIST_INTERFACES, [type._value])
         .then((response) {
           if (isErrorResponse(response)) {
             throw createError(response, "Failed listing interfaces");
           } else {
             var list = new List<NetworkInterface>();
             var map = response.skip(1)
                 .fold(new Map<String, List<InternetAddress>>(), (map, result) {
                   var type = new InternetAddressType._from(result[0]);
                   var name = result[3];
                   var address = new _InternetAddress(
@@ skipping 18 matching lines @@
           if (host is _InternetAddress) return host;
           return lookup(host)
               .then((list) {
                 if (list.length == 0) {
                   throw createError(response, "Failed host lookup: '$host'");
                 }
                 return list[0];
               });
         })
         .then((address) {
-          ensureSocketService();
           var socket = new _NativeSocket.normal();
           socket.address = address;
           var result = socket.nativeCreateConnect(
               address._sockaddr_storage, port);
           if (result is OSError) {
             throw createError(result, "Connection failed", address, port);
           } else {
             socket.port;  // Query the local port, for error messages.
             var completer = new Completer();
             // Setup handlers for receiving the first write event which
@@ skipping 289 matching lines @@
     }
   }
 
   void disconnectFromEventHandler() {
     if (eventPort != null) {
       eventPort.close();
       eventPort = null;
     }
   }
 
-  static void ensureSocketService() {
-    if (socketService == null) {
-      socketService = _NativeSocket.newServicePort();
-    }
-  }
-
   // Check whether this is an error response from a native port call.
   static bool isErrorResponse(response) {
     return response is List && response[0] != _SUCCESS_RESPONSE;
   }
 
   // Create the appropriate error/exception from different returned
   // error objects.
   static createError(error,
                      String message,
                      [InternetAddress address,
@@ skipping 42 matching lines @@
       native "Socket_WriteList";
   nativeCreateConnect(List<int> addr,
                       int port) native "Socket_CreateConnect";
   nativeCreateBindListen(List<int> addr, int port, int backlog, bool v6Only)
       native "ServerSocket_CreateBindListen";
   nativeAccept(_NativeSocket socket) native "ServerSocket_Accept";
   int nativeGetPort() native "Socket_GetPort";
   List nativeGetRemotePeer() native "Socket_GetRemotePeer";
   OSError nativeGetError() native "Socket_GetError";
   bool nativeSetOption(int option, bool enabled) native "Socket_SetOption";
-
-  static SendPort newServicePort() native "Socket_NewServicePort";
 }
 
 
 class _RawServerSocket extends Stream<RawSocket>
                        implements RawServerSocket {
   final _NativeSocket _socket;
   StreamController<RawSocket> _controller;
 
   static Future<_RawServerSocket> bind(address,
                                        int port,
@@ skipping 536 matching lines @@
     if (_detachReady != null) {
       _detachReady.complete(null);
     } else {
       if (_raw != null) {
         _raw.shutdown(SocketDirection.SEND);
         _disableWriteEvent();
       }
     }
   }
 }