Remove 'mask' from SocketData, as it's not required.

runtime/bin/eventhandler_linux.cc

 // Copyright (c) 2012, 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.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_LINUX)
 
 #include "bin/eventhandler.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 30 matching lines @@
                                             EPOLL_CTL_DEL,
                                             sd->fd(),
                                             NULL));
   if (status == -1) {
     FATAL("Failed unregistering events for file descriptor");
   }
   sd->set_tracked_by_epoll(false);
 }
 
 
-static void AddToEpollInstance(intptr_t epoll_fd_, SocketData* sd) {
+static void AddToEpollInstance(intptr_t epoll_fd_, SocketData* sd, int mask) {
   ASSERT(!sd->tracked_by_epoll());
   struct epoll_event event;
   event.events = EPOLLET | EPOLLRDHUP;
-  if ((sd->mask() & (1 << kInEvent)) != 0) event.events |= EPOLLIN;
-  if ((sd->mask() & (1 << kOutEvent)) != 0) event.events |= EPOLLOUT;
+  if ((mask & (1 << kInEvent)) != 0) event.events |= EPOLLIN;
+  if ((mask & (1 << kOutEvent)) != 0) event.events |= EPOLLOUT;
   event.data.ptr = sd;
   int status = TEMP_FAILURE_RETRY(epoll_ctl(epoll_fd_,
                                             EPOLL_CTL_ADD,
                                             sd->fd(),
                                             &event));
   if (status == -1) {
     // Epoll does not accept the file descriptor. It could be due to
     // already closed file descriptor, or unuspported devices, such
     // as /dev/null. In such case, mark the file descriptor as closed,
     // so dart will handle it accordingly.
@@ skipping 116 matching lines @@
         it.it_value.tv_sec = millis / 1000;
         it.it_value.tv_nsec = (millis % 1000) * 1000000;
       }
       timerfd_settime(timer_fd_, TFD_TIMER_ABSTIME, &it, NULL);
     } else if (msg[i].id == kShutdownId) {
       shutdown_ = true;
     } else {
       bool is_new = false;
       SocketData* sd = GetSocketData(msg[i].id, &is_new);
       if (is_new) {
-        sd->SetPortAndMask(msg[i].dart_port, msg[i].data);
-        AddToEpollInstance(epoll_fd_, sd);
+        sd->SetPort(msg[i].dart_port);
+        AddToEpollInstance(epoll_fd_, sd, msg[i].data);
       }
       if ((msg[i].data & (1 << kShutdownReadCommand)) != 0) {
         ASSERT(msg[i].data == (1 << kShutdownReadCommand));
         // Close the socket for reading.
         sd->ShutdownRead();
       } else if ((msg[i].data & (1 << kShutdownWriteCommand)) != 0) {
         ASSERT(msg[i].data == (1 << kShutdownWriteCommand));
         // Close the socket for writing.
         sd->ShutdownWrite();
       } else if ((msg[i].data & (1 << kCloseCommand)) != 0) {
@@ skipping 25 matching lines @@
   if ((events & ~all_events) != 0) {
     Log::Print("(and %08x) ", events & ~all_events);
   }
   Log::Print("(available %d) ", FDUtils::AvailableBytes(fd));
 
   Log::Print("\n");
 }
 #endif
 
 intptr_t EventHandlerImplementation::GetPollEvents(intptr_t events,
                                                    SocketData* sd) {

[Søren Gjesse, 2014/02/19 15:53:25]

Maybe I am wrong, but it seems like this is now echoing EPOLLIN, EPOLLOUT,
EPOLLHUP (and EPOLLRDHUP) if there is no error, and just send error if there is
error.

[Anders Johnsen, 2014/02/19 16:08:29]

Done.

 #ifdef DEBUG_POLL
   PrintEventMask(sd->fd(), events);
 #endif
   intptr_t event_mask = 0;
-  if (sd->IsListeningSocket()) {
-    // For listening sockets the EPOLLIN event indicate that there are
-    // connections ready for accept unless accompanied with one of the
-    // other flags.
+  // Prioritize data events over close and error events.

[Søren Gjesse, 2014/02/19 15:53:25]

This comment seems wrong. We are not prioritizing data events over close and
error events. Actually error events are prioritized, and close events are
combined with data events.

[Anders Johnsen, 2014/02/19 16:08:29]

Done.

+  if ((events & (EPOLLIN | EPOLLHUP | EPOLLRDHUP)) != 0) {

[Søren Gjesse, 2014/02/19 15:53:25]

Is this if statement actually needed?

[Anders Johnsen, 2014/02/19 16:08:29]

Done.

+    // If we have EPOLLIN and we have available bytes, report that.
     if ((events & EPOLLIN) != 0) {
-      if ((events & EPOLLHUP) != 0) event_mask |= (1 << kCloseEvent);
-      if ((events & EPOLLERR) != 0) event_mask |= (1 << kErrorEvent);
-      if (event_mask == 0) event_mask |= (1 << kInEvent);
+      event_mask = (1 << kInEvent);
     }
-  } else {
-    // Prioritize data events over close and error events.
-    if ((events & (EPOLLIN | EPOLLHUP | EPOLLRDHUP)) != 0) {
-      // If we have EPOLLIN and we have available bytes, report that.
-      if ((events & EPOLLIN) != 0) {
-        event_mask = (1 << kInEvent);
+    if ((events & (EPOLLHUP | EPOLLRDHUP)) != 0) {
+      // If both EPOLLHUP and EPOLLERR are reported treat it as an
+      // error.
+      if ((events & EPOLLERR) != 0) {
+        event_mask = (1 << kErrorEvent);
+      } else {
+        event_mask |= (1 << kCloseEvent);
       }
-      if ((events & (EPOLLHUP | EPOLLRDHUP)) != 0) {
-        // If both EPOLLHUP and EPOLLERR are reported treat it as an
-        // error.
-        if ((events & EPOLLERR) != 0) {
-          event_mask = (1 << kErrorEvent);
-        } else {
-          event_mask |= (1 << kCloseEvent);
-        }
-      } else if ((events & EPOLLERR) != 0) {
-        event_mask = (1 << kErrorEvent);
-      }
+    } else if ((events & EPOLLERR) != 0) {
+      event_mask = (1 << kErrorEvent);
     }
+  }
 
-    if ((events & EPOLLOUT) != 0) {
-      if ((events & EPOLLERR) != 0) {
-        if (!sd->IsPipe()) {
-          event_mask = (1 << kErrorEvent);
-        }
-      } else {
-        event_mask |= (1 << kOutEvent);
-      }
-    }
+  if ((events & EPOLLOUT) != 0 && (events & EPOLLERR) == 0) {

[Søren Gjesse, 2014/02/19 15:53:25]

Can't this move up after line 250?

[Anders Johnsen, 2014/02/19 16:08:29]

Done.

+    event_mask |= (1 << kOutEvent);
   }
 
   return event_mask;
 }
 
 
 void EventHandlerImplementation::HandleEvents(struct epoll_event* events,
                                               int size) {
   bool interrupt_seen = false;
   for (int i = 0; i < size; i++) {
@@ skipping 77 matching lines @@
 
 uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) {
   // The hashmap does not support keys with value 0.
   return dart::Utils::WordHash(fd + 1);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)