Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: runtime/bin/socket_patch.dart

Issue 250513002: Add support for cloning server-sockets. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Review feedback. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/socket.cc ('k') | sdk/lib/io/socket.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_patch.dart
diff --git a/runtime/bin/socket_patch.dart b/runtime/bin/socket_patch.dart
index 98de2a0bea00ed304ad9d19ff9fdcdbe506d2bae..7445562d6707a364f9b78be928cbf0fc11f008df 100644
--- a/runtime/bin/socket_patch.dart
+++ b/runtime/bin/socket_patch.dart
@@ -390,6 +390,9 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
static const int PROTOCOL_IPV4 = 1 << 0;
static const int PROTOCOL_IPV6 = 1 << 1;
+ static const int NORMAL_TOKEN_BATCH_SIZE = 8;
+ static const int LISTENING_TOKEN_BATCH_SIZE = 2;
+
// Socket close state
bool isClosed = false;
bool isClosing = false;
@@ -712,7 +715,7 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
assert(available > 0);
available--;
tokens++;
- returnTokens();
+ returnTokens(LISTENING_TOKEN_BATCH_SIZE);
var socket = new _NativeSocket.normal();
if (nativeAccept(socket) != true) return null;
socket.localPort = localPort;
@@ -846,14 +849,14 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
}
if (!isListening) {
tokens++;
- returnTokens();
+ returnTokens(NORMAL_TOKEN_BATCH_SIZE);
}
}
- void returnTokens() {
+ void returnTokens(int tokenBatchSize) {
if (eventPort != null && !isClosing && !isClosed) {
- if (tokens == 8) {
- // Return in batches of 8.
+ // Return in batches.
+ if (tokens == tokenBatchSize) {
assert(tokens < (1 << FIRST_COMMAND));
sendToEventHandler((1 << RETURN_TOKEN_COMMAND) | tokens);
tokens = 0;
@@ -1068,6 +1071,7 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
nativeAccept(_NativeSocket socket) native "ServerSocket_Accept";
int nativeGetPort() native "Socket_GetPort";
List nativeGetRemotePeer() native "Socket_GetRemotePeer";
+ int nativeGetSocketId() native "Socket_GetSocketId";
OSError nativeGetError() native "Socket_GetError";
nativeGetOption(int option, int protocol) native "Socket_GetOption";
bool nativeSetOption(int option, int protocol, value)
@@ -1085,6 +1089,7 @@ class _RawServerSocket extends Stream<RawSocket>
implements RawServerSocket {
final _NativeSocket _socket;
StreamController<RawSocket> _controller;
+ ReceivePort _referencePort;
static Future<_RawServerSocket> bind(address,
int port,
@@ -1125,7 +1130,12 @@ class _RawServerSocket extends Stream<RawSocket>
_controller.addError(e);
_controller.close();
}),
- destroyed: _controller.close);
+ destroyed: () {
+ _controller.close();
+ if (_referencePort != null) {
+ _referencePort.close();
+ }
+ });
return _controller.stream.listen(
onData,
onError: onError,
@@ -1162,6 +1172,44 @@ class _RawServerSocket extends Stream<RawSocket>
_resume();
}
}
+
+ RawServerSocketReference get reference {
+ if (_referencePort == null) {
+ _referencePort = new ReceivePort();
+ _referencePort.listen((sendPort) {
+ sendPort.send(
+ [_socket.nativeGetSocketId(),
+ _socket.address,
+ _socket.localPort]);
+ });
+ }
+ return new _RawServerSocketReference(_referencePort.sendPort);
+ }
+}
+
+
+class _RawServerSocketReference implements RawServerSocketReference {
+ final SendPort _sendPort;
+
+ _RawServerSocketReference(this._sendPort);
+
+ Future<RawServerSocket> create() {
+ var port = new ReceivePort();
+ _sendPort.send(port.sendPort);
+ return port.first.then((args) {
+ port.close();
+ var native = new _NativeSocket.listen();
+ native.nativeSetSocketId(args[0]);
+ native.address = args[1];
+ native.localPort = args[2];
+ return new _RawServerSocket(native);
+ });
+ }
+
+ int get hashCode => _sendPort.hashCode;
+
+ bool operator==(Object other)
+ => other is _RawServerSocketReference && _sendPort == other._sendPort;
}
@@ -1322,6 +1370,18 @@ patch class ServerSocket {
}
}
+
+class _ServerSocketReference implements ServerSocketReference {
+ final RawServerSocketReference _rawReference;
+
+ _ServerSocketReference(this._rawReference);
+
+ Future<ServerSocket> create() {
+ return _rawReference.create().then((raw) => new _ServerSocket(raw));
+ }
+}
+
+
class _ServerSocket extends Stream<Socket>
implements ServerSocket {
final _socket;
@@ -1352,6 +1412,10 @@ class _ServerSocket extends Stream<Socket>
InternetAddress get address => _socket.address;
Future close() => _socket.close().then((_) => this);
+
+ ServerSocketReference get reference {
+ return new _ServerSocketReference(_socket.reference);
+ }
}
« no previous file with comments | « runtime/bin/socket.cc ('k') | sdk/lib/io/socket.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698