Cleanup in //runtime/bin

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 "bin/eventhandler_android.h"
 
 #include <errno.h>  // NOLINT
+#include <fcntl.h>  // NOLINT
 #include <pthread.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <string.h>  // NOLINT
 #include <sys/epoll.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 #include <unistd.h>  // NOLINT
-#include <fcntl.h>  // NOLINT
 
 #include "bin/dartutils.h"
 #include "bin/fdutils.h"
 #include "bin/log.h"
 #include "bin/lockers.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 #include "platform/hashmap.h"
 #include "platform/utils.h"
 
-
 // Android doesn't define EPOLLRDHUP.
 #if !defined(EPOLLRDHUP)
 #define EPOLLRDHUP 0x2000
 #endif  // !defined(EPOLLRDHUP)
 
-
 namespace dart {
 namespace bin {
 
-
 intptr_t DescriptorInfo::GetPollEvents() {
   // Do not ask for EPOLLERR and EPOLLHUP explicitly as they are
   // triggered anyway.
   intptr_t events = 0;
   if ((Mask() & (1 << kInEvent)) != 0) {
     events |= EPOLLIN;
   }
   if ((Mask() & (1 << kOutEvent)) != 0) {
     events |= EPOLLOUT;
   }
@@ skipping 71 matching lines @@
 EventHandlerImplementation::~EventHandlerImplementation() {
   VOID_TEMP_FAILURE_RETRY(close(epoll_fd_));
   VOID_TEMP_FAILURE_RETRY(close(interrupt_fds_[0]));
   VOID_TEMP_FAILURE_RETRY(close(interrupt_fds_[1]));
 }
 
 
 void EventHandlerImplementation::UpdateEpollInstance(intptr_t old_mask,
                                                      DescriptorInfo *di) {
   intptr_t new_mask = di->Mask();
-  if (old_mask != 0 && new_mask == 0) {
+  if ((old_mask != 0) && (new_mask == 0)) {
     RemoveFromEpollInstance(epoll_fd_, di);
-  } else if (old_mask == 0 && new_mask != 0) {
+  } else if ((old_mask == 0) && (new_mask != 0)) {
     AddToEpollInstance(epoll_fd_, di);
-  } else if (old_mask != 0 && new_mask != 0 && old_mask != new_mask) {
+  } else if ((old_mask != 0) && (new_mask != 0) && (old_mask != new_mask)) {
     ASSERT(!di->IsListeningSocket());
     RemoveFromEpollInstance(epoll_fd_, di);
     AddToEpollInstance(epoll_fd_, di);
   }
 }
 
 
 DescriptorInfo* EventHandlerImplementation::GetDescriptorInfo(
     intptr_t fd, bool is_listening) {
   ASSERT(fd >= 0);
@@ skipping 110 matching lines @@
         intptr_t old_mask = di->Mask();
         di->SetPortAndMask(msg[i].dart_port, msg[i].data & EVENT_MASK);
         UpdateEpollInstance(old_mask, di);
       } else {
         UNREACHABLE();
       }
     }
   }
 }
 
+
 #ifdef DEBUG_POLL
 static void PrintEventMask(intptr_t fd, intptr_t events) {
   Log::Print("%d ", fd);
-  if ((events & EPOLLIN) != 0) Log::Print("EPOLLIN ");
-  if ((events & EPOLLPRI) != 0) Log::Print("EPOLLPRI ");
-  if ((events & EPOLLOUT) != 0) Log::Print("EPOLLOUT ");
-  if ((events & EPOLLERR) != 0) Log::Print("EPOLLERR ");
-  if ((events & EPOLLHUP) != 0) Log::Print("EPOLLHUP ");
-  if ((events & EPOLLRDHUP) != 0) Log::Print("EPOLLRDHUP ");
+  if ((events & EPOLLIN) != 0) {
+    Log::Print("EPOLLIN ");
+  }
+  if ((events & EPOLLPRI) != 0) {
+    Log::Print("EPOLLPRI ");
+  }
+  if ((events & EPOLLOUT) != 0) {
+    Log::Print("EPOLLOUT ");
+  }
+  if ((events & EPOLLERR) != 0) {
+    Log::Print("EPOLLERR ");
+  }
+  if ((events & EPOLLHUP) != 0) {
+    Log::Print("EPOLLHUP ");
+  }
+  if ((events & EPOLLRDHUP) != 0) {
+    Log::Print("EPOLLRDHUP ");
+  }
   int all_events = EPOLLIN | EPOLLPRI | EPOLLOUT |
       EPOLLERR | EPOLLHUP | EPOLLRDHUP;
   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,
                                                    DescriptorInfo* di) {
 #ifdef DEBUG_POLL
   PrintEventMask(di->fd(), events);
 #endif
   if (events & EPOLLERR) {
     // Return error only if EPOLLIN is present.
     return (events & EPOLLIN) ? (1 << kErrorEvent) : 0;
   }
   intptr_t event_mask = 0;
-  if (events & EPOLLIN) event_mask |= (1 << kInEvent);
-  if (events & EPOLLOUT) event_mask |= (1 << kOutEvent);
-  if (events & (EPOLLHUP | EPOLLRDHUP)) event_mask |= (1 << kCloseEvent);
+  if (events & EPOLLIN) {
+    event_mask |= (1 << kInEvent);
+  }
+  if (events & EPOLLOUT) {
+    event_mask |= (1 << kOutEvent);
+  }
+  if (events & (EPOLLHUP | EPOLLRDHUP)) {
+    event_mask |= (1 << kCloseEvent);
+  }
   return event_mask;
 }
 
 
 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;
@@ skipping 43 matching lines @@
 void EventHandlerImplementation::Poll(uword args) {
   ThreadSignalBlocker signal_blocker(SIGPROF);
   static const intptr_t kMaxEvents = 16;
   struct epoll_event events[kMaxEvents];
   EventHandler* handler = reinterpret_cast<EventHandler*>(args);
   EventHandlerImplementation* handler_impl = &handler->delegate_;
   ASSERT(handler_impl != NULL);
 
   while (!handler_impl->shutdown_) {
     int64_t millis = handler_impl->GetTimeout();
-    ASSERT(millis == kInfinityTimeout || millis >= 0);
-    if (millis > kMaxInt32) millis = kMaxInt32;
+    ASSERT((millis == kInfinityTimeout) || (millis >= 0));
+    if (millis > kMaxInt32) {
+      millis = kMaxInt32;
+    }
     intptr_t result = TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
         epoll_wait(handler_impl->epoll_fd_, events, kMaxEvents, millis));
     ASSERT(EAGAIN == EWOULDBLOCK);
     if (result == -1) {
       if (errno != EWOULDBLOCK) {
         perror("Poll failed");
       }
     } else {
       handler_impl->HandleTimeout();
       handler_impl->HandleEvents(events, result);
@@ skipping 32 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)