Add Proces owner of socket and fix printing of non-network sockets

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 594 matching lines @@
           if (port != 0) socket.localPort = port;
           return socket;
         });
   }
 
   _NativeSocket.datagram(this.address)
     : typeFlags = TYPE_NORMAL_SOCKET | TYPE_UDP_SOCKET;
 
   _NativeSocket.normal() : typeFlags = TYPE_NORMAL_SOCKET | TYPE_TCP_SOCKET;
 
-  _NativeSocket.listen() : super(), typeFlags = TYPE_LISTENING_SOCKET | TYPE_TCP_SOCKET;
+  _NativeSocket.listen()
+      : super(),

[Anders Johnsen, 2014/05/28 06:53:32]

Oh, this super call is not needed. Can you remove it?

[Cutch, 2014/05/28 07:07:41]

Done.

+        typeFlags = TYPE_LISTENING_SOCKET | TYPE_TCP_SOCKET;
 
   _NativeSocket.pipe() : typeFlags = TYPE_PIPE;
 
   _NativeSocket.watch(int id)
       : typeFlags = TYPE_NORMAL_SOCKET | TYPE_INTERNAL_SOCKET {
     isClosedWrite = true;
     nativeSetSocketId(id);
   }
 
   bool get isListening => (typeFlags & TYPE_LISTENING_SOCKET) != 0;
@@ skipping 269 matching lines @@
       if (!isClosedWrite) flags |= 1 << WRITE_EVENT;
       sendToEventHandler(flags);
     }
   }
 
   Future close() {
     if (!isClosing && !isClosed) {
       sendToEventHandler(1 << CLOSE_COMMAND);
       isClosing = true;
     }
+    _sockets.remove(_serviceId);

[Anders Johnsen, 2014/05/28 06:53:32]

This should not be done here. If you have a case where we need this, please
forward me an example as we have a bug.

[Cutch, 2014/05/28 07:07:41]

No, it was left over debugging stuff from yesterday.

Removed.

     return closeCompleter.future;
   }
 
   void shutdown(SocketDirection direction) {
     if (!isClosing && !isClosed) {
       switch (direction) {
         case SocketDirection.RECEIVE:
           shutdownRead();
           break;
         case SocketDirection.SEND:
@@ skipping 149 matching lines @@
     var result = nativeLeaveMulticast(
         addr._in_addr,
         interfaceAddr == null ? null : interfaceAddr._in_addr,
         interfaceIndex);
     if (result is OSError) throw result;
   }
 
   String get _serviceTypePath => 'io/sockets';
   String get _serviceTypeName => 'Socket';
 
-  Map _toJSON(bool ref) {
+  String _JSONKind() {
+    return isListening ? "LISTENING" :
+           isPipe ? "PIPE" :
+           isInternal ? "INTERNAL" : "NORMAL";
+  }
+
+  Map _toJSONPipe(bool ref) {
+    var name;
+    if (isClosed) {
+      name = 'CLOSED PIPE';
+    } else if (isClosedWrite) {
+      name = 'READ PIPE';
+    } else if (isClosedRead) {
+      name = 'WRITE PIPE';
+    } else {
+      name = 'R/W PIPE';
+    }
+    var r = {
+      'id': _servicePath,
+      'type': _serviceType(ref),
+      'name': name,
+      'user_name': name,
+      'kind': _JSONKind(),
+    };
+    if (ref) {
+      return r;
+    }
+    r['fd'] = nativeGetSocketId();
+    if (owner != null) {
+      r['owner'] = owner._toJSON(true);
+    }
+    return r;
+  }
+
+  Map _toJSONNetwork(bool ref) {
     var name = '${address.host}:$port';
     if (isTcp && !isListening) name += " <-> ${remoteAddress.host}:$remotePort";
     var r = {
       'id': _servicePath,
       'type': _serviceType(ref),
       'name': name,
       'user_name': name,
+      'kind': _JSONKind(),
     };
     if (ref) {
       return r;
     }
     r['port'] = port;
     r['address'] = address.host;
     r['fd'] = nativeGetSocketId();
     if (owner != null) {
       r['owner'] = owner._toJSON(true);
     }
     return r;
   }
 
+  Map _toJSON(bool ref) {
+    if (isPipe) {
+      return _toJSONPipe(ref);
+    }
+    return _toJSONNetwork(ref);
+  }
+
   void nativeSetSocketId(int id) native "Socket_SetSocketId";
   nativeAvailable() native "Socket_Available";
   nativeRead(int len) native "Socket_Read";
   nativeRecvFrom() native "Socket_RecvFrom";
   nativeWrite(List<int> buffer, int offset, int bytes)
       native "Socket_WriteList";
   nativeSendTo(List<int> buffer, int offset, int bytes,
                List<int> address, int port)
       native "Socket_SendTo";
   nativeCreateConnect(List<int> addr,
@@ skipping 806 matching lines @@
                        String address,
                        List<int> in_addr,
                        int port) {
   return new Datagram(
       data,
       new _InternetAddress(address, null, in_addr),
       port);
 }
 
 String _socketsStats() => _SocketsObservatory.toJSON();