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

Unified Diff: dart/runtime/bin/eventhandler_linux.cc

Issue 665823007: Several bugfixes in dart:io's handing of sockets (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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
Index: dart/runtime/bin/eventhandler_linux.cc
diff --git a/dart/runtime/bin/eventhandler_linux.cc b/dart/runtime/bin/eventhandler_linux.cc
index 0701810a55bbc135d5533b4239d11c2114dc8e93..805c641e74881c0e7dc1e6585a085ca241e22db6 100644
--- a/dart/runtime/bin/eventhandler_linux.cc
+++ b/dart/runtime/bin/eventhandler_linux.cc
@@ -200,17 +200,17 @@ void EventHandlerImplementation::HandleInterruptFd() {
SocketData* sd = GetSocketData(
msg[i].id, (msg[i].data & (1 << kListeningSocket)) != 0);
if ((msg[i].data & (1 << kShutdownReadCommand)) != 0) {
- ASSERT(msg[i].data == (1 << kShutdownReadCommand));
+ ASSERT(COMMAND_MASK(msg[i].data) == (1 << kShutdownReadCommand));
ASSERT(!sd->IsListeningSocket());
// Close the socket for reading.
VOID_NO_RETRY_EXPECTED(shutdown(sd->fd(), SHUT_RD));
} else if ((msg[i].data & (1 << kShutdownWriteCommand)) != 0) {
- ASSERT(msg[i].data == (1 << kShutdownWriteCommand));
+ ASSERT(COMMAND_MASK(msg[i].data) == (1 << kShutdownWriteCommand));
ASSERT(!sd->IsListeningSocket());
// Close the socket for writing.
VOID_NO_RETRY_EXPECTED(shutdown(sd->fd(), SHUT_WR));
} else if ((msg[i].data & (1 << kCloseCommand)) != 0) {
- ASSERT(msg[i].data == (1 << kCloseCommand));
+ ASSERT(COMMAND_MASK(msg[i].data) == (1 << kCloseCommand));
// Close the socket and free system resources and move on to
// next message.
if (sd->RemovePort(msg[i].dart_port)) {

Powered by Google App Engine
This is Rietveld 408576698