Removes EPOLLONESHOT from Android eventhandler.

runtime/bin/eventhandler_android.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_ANDROID)
 
 #include "bin/eventhandler.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 56 matching lines @@
 }
 
 
 // Register the file descriptor for a SocketData structure with epoll
 // if events are requested.
 static void UpdateEpollInstance(intptr_t epoll_fd_, SocketData* sd) {
   struct epoll_event event;
   event.events = sd->GetPollEvents();
   event.data.ptr = sd;
   if (sd->port() != 0 && event.events != 0) {
-    // Only report events once and wait for them to be re-enabled after the
-    // event has been handled by the Dart code.
-    event.events |= EPOLLONESHOT;
     int status = 0;
     if (sd->tracked_by_epoll()) {
       status = TEMP_FAILURE_RETRY(epoll_ctl(epoll_fd_,
                                             EPOLL_CTL_MOD,
                                             sd->fd(),
                                             &event));
     } else {
       status = TEMP_FAILURE_RETRY(epoll_ctl(epoll_fd_,
                                             EPOLL_CTL_ADD,
                                             sd->fd(),
@@ skipping 82 matching lines @@
   if (result != kInterruptMessageSize) {
     if (result == -1) {
       perror("Interrupt message failure:");
     }
     FATAL1("Interrupt message failure. Wrote %d bytes.", result);
   }
 }
 
 
 void EventHandlerImplementation::HandleInterruptFd() {
-  const intptr_t MAX_MESSAGES = kInterruptMessageSize;
-  InterruptMessage msg[MAX_MESSAGES];
-  ssize_t bytes = TEMP_FAILURE_RETRY(
-      read(interrupt_fds_[0], msg, MAX_MESSAGES * kInterruptMessageSize));
-  for (ssize_t i = 0; i < bytes / kInterruptMessageSize; i++) {
-    if (msg[i].id == kTimerId) {
-      timeout_queue_.UpdateTimeout(msg[i].dart_port, msg[i].data);
-    } else if (msg[i].id == kShutdownId) {
+  InterruptMessage msg;

[Ivan Posva, 2013/11/22 23:38:25]

As discussed I don't think these changes had anything to do with "one shot".

+  intptr_t available = FDUtils::AvailableBytes(interrupt_fds_[0]);
+  for (int i = 0;
+       i + kInterruptMessageSize <= available;
+       i += kInterruptMessageSize) {
+    VOID_TEMP_FAILURE_RETRY(read(interrupt_fds_[0],
+                                 reinterpret_cast<char*>(&msg),
+                                 kInterruptMessageSize));
+    if (msg.id == kTimerId) {
+      timeout_queue_.UpdateTimeout(msg.dart_port, msg.data);
+    } else if (msg.id == kShutdownId) {
       shutdown_ = true;
     } else {
-      SocketData* sd = GetSocketData(msg[i].id);
-      if ((msg[i].data & (1 << kShutdownReadCommand)) != 0) {
-        ASSERT(msg[i].data == (1 << kShutdownReadCommand));
+      SocketData* sd = GetSocketData(msg.id);
+      if ((msg.data & (1 << kShutdownReadCommand)) != 0) {
+        ASSERT(msg.data == (1 << kShutdownReadCommand));
         // Close the socket for reading.
         sd->ShutdownRead();
         UpdateEpollInstance(epoll_fd_, sd);
-      } else if ((msg[i].data & (1 << kShutdownWriteCommand)) != 0) {
-        ASSERT(msg[i].data == (1 << kShutdownWriteCommand));
+      } else if ((msg.data & (1 << kShutdownWriteCommand)) != 0) {
+        ASSERT(msg.data == (1 << kShutdownWriteCommand));
         // Close the socket for writing.
         sd->ShutdownWrite();
         UpdateEpollInstance(epoll_fd_, sd);
-      } else if ((msg[i].data & (1 << kCloseCommand)) != 0) {
-        ASSERT(msg[i].data == (1 << kCloseCommand));
+      } else if ((msg.data & (1 << kCloseCommand)) != 0) {
+        ASSERT(msg.data == (1 << kCloseCommand));
         // Close the socket and free system resources and move on to
         // next message.
         RemoveFromEpollInstance(epoll_fd_, sd);
         intptr_t fd = sd->fd();
         if (fd == STDOUT_FILENO) {
           // If stdout, redirect fd to /dev/null.
           int null_fd = TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY));
           ASSERT(null_fd >= 0);
           VOID_TEMP_FAILURE_RETRY(dup2(null_fd, STDOUT_FILENO));
           VOID_TEMP_FAILURE_RETRY(close(null_fd));
         } else {
           sd->Close();
         }
         socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd));
         delete sd;
-        DartUtils::PostInt32(msg[i].dart_port, 1 << kDestroyedEvent);
+        DartUtils::PostInt32(msg.dart_port, 1 << kDestroyedEvent);
       } else {
         // Setup events to wait for.
-        sd->SetPortAndMask(msg[i].dart_port, msg[i].data);
+        sd->SetPortAndMask(msg.dart_port, msg.data);
         UpdateEpollInstance(epoll_fd_, sd);
       }
     }
   }
 }
 
 #ifdef DEBUG_POLL
 static void PrintEventMask(intptr_t fd, intptr_t events) {
   Log::Print("%d ", fd);
   if ((events & EPOLLIN) != 0) Log::Print("EPOLLIN ");
@@ skipping 100 matching lines @@
 
 void EventHandlerImplementation::HandleEvents(struct epoll_event* events,
                                               int size) {
   bool interrupt_seen = false;
   for (int i = 0; i < size; i++) {
     if (events[i].data.ptr == NULL) {
       interrupt_seen = true;
     } else {
       SocketData* sd = reinterpret_cast<SocketData*>(events[i].data.ptr);
       intptr_t event_mask = GetPollEvents(events[i].events, sd);
-      if (event_mask == 0) {
-        // Event not handled, re-add to epoll.
-        UpdateEpollInstance(epoll_fd_, sd);
-      } else {
+      if (event_mask != 0) {
+        // Unregister events for the file descriptor. Events will be
+        // registered again when the current event has been handled in
+        // Dart code.
+        RemoveFromEpollInstance(epoll_fd_, sd);
         Dart_Port port = sd->port();
         ASSERT(port != 0);
         DartUtils::PostInt32(port, event_mask);
       }
     }
   }
   if (interrupt_seen) {
     // Handle after socket events, so we avoid closing a socket before we handle
     // the current events.
     HandleInterruptFd();
@@ skipping 35 matching lines @@
     if (millis > kMaxInt32) millis = kMaxInt32;
     intptr_t result = TEMP_FAILURE_RETRY(epoll_wait(handler->epoll_fd_,
                                                     events,
                                                     kMaxEvents,
                                                     millis));
     ASSERT(EAGAIN == EWOULDBLOCK);
     if (result == -1) {
       if (errno != EWOULDBLOCK) {
         perror("Poll failed");
       }
-    } else if (result == 0) {
+    } else {
       handler->HandleTimeout();
-    } else {
       handler->HandleEvents(events, result);
     }
   }
 }
 
 
 void EventHandlerImplementation::Start(EventHandler* handler) {
   int result = dart::Thread::Start(&EventHandlerImplementation::Poll,
                                    reinterpret_cast<uword>(handler));
   if (result != 0) {
@@ skipping 22 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_ANDROID)