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

Unified Diff: runtime/bin/socket_impl.dart

Issue 8399039: Explicitly handle listen sockets and connection sockets differently in Linux and Mac OS eventhandler (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix Mac OS build Created 9 years, 2 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/eventhandler_macos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_impl.dart
diff --git a/runtime/bin/socket_impl.dart b/runtime/bin/socket_impl.dart
index 8af1818c02d8b735672324e14778a2a50110a59e..7c69282485980633d0bcc3784a5e7608035d947d 100644
--- a/runtime/bin/socket_impl.dart
+++ b/runtime/bin/socket_impl.dart
@@ -4,19 +4,29 @@
class _SocketBase {
-
- /*
- * Keep these constants in sync with the native poll event identifiers.
- */
+ // Bit flags used when communicating between the eventhandler and
+ // dart code. The EVENT flags are used to indicate events of
+ // interest when sending a message from dart code to the
+ // eventhandler. When receiving a message from the eventhandler the
+ // EVENT flags indicate the events that actually happened. The
+ // COMMAND flags are used to send commands from dart to the
+ // eventhandler. COMMAND flags are never received from the
+ // eventhandler. Additional flags are used to communicate other
+ // information.
static final int _IN_EVENT = 0;
static final int _OUT_EVENT = 1;
static final int _ERROR_EVENT = 2;
static final int _CLOSE_EVENT = 3;
+
+ static final int _CLOSE_COMMAND = 8;
+
+ // Flag send to the eventhandler saying that the file descriptor in
+ // question represents a listening socket.
+ static final int _LISTENING_SOCKET = 16;
+
static final int _FIRST_EVENT = _IN_EVENT;
static final int _LAST_EVENT = _CLOSE_EVENT;
- static final int _CLOSE_COMMAND = 4;
-
_SocketBase () {
_handler = new ReceivePort();
_handlerMap = new List(_CLOSE_EVENT + 1);
@@ -72,7 +82,9 @@ class _SocketBase {
void _doActivateHandlers() {
if (_canActivateHandlers && (_id >= 0)) {
- EventHandler._sendData(_id, _handler, _handlerMask);
+ int data = _handlerMask;
+ if (_isListenSocket()) data |= (1 << _LISTENING_SOCKET);
+ EventHandler._sendData(_id, _handler, data);
}
}
@@ -106,6 +118,7 @@ class _SocketBase {
}
}
+ abstract bool _isListenSocket();
/*
* Socket id is set from native. -1 indicates that the socket was closed.
@@ -180,6 +193,8 @@ class _ServerSocket extends _SocketBase implements ServerSocket {
void setConnectionHandler(void callback()) {
_setHandler(_IN_EVENT, callback);
}
+
+ bool _isListenSocket() => true;
}
@@ -275,6 +290,8 @@ class _Socket extends _SocketBase implements Socket {
_setHandler(_CLOSE_EVENT, callback);
}
+ bool _isListenSocket() => false;
+
InputStream get inputStream() {
if (_inputStream === null) {
_inputStream = new SocketInputStream(this);
« no previous file with comments | « runtime/bin/eventhandler_macos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698