commit e5012bac7a57df6b1993a1eaa9b8b3c4d7671975
author Sree Kuchibhotla <sreek@google.com> Mon Jun 06 16:01:45 2016 -0700
committer Sree Kuchibhotla <sreek@google.com> Mon Jun 06 16:01:45 2016 -0700
tree 25ea5f53b4f093105838bd3832b70d36520084bb
parent d627c105847f0d262ce3886fb5b463dc914ddbd7

Remove redundant code

src/core/lib/iomgr/ev_epoll_linux.c

diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c
index 0e00d4d..f7ac4ae 100644
--- a/src/core/lib/iomgr/ev_epoll_linux.c
+++ b/src/core/lib/iomgr/ev_epoll_linux.c
@@ -986,42 +986,39 @@
   gpr_mu_unlock(&pollset->pi_mu);
   gpr_mu_unlock(&pollset->mu);
 
-  /* If epoll_fd == -1, this is a blank pollset and does not have any fds yet */
-  if (epoll_fd != -1) {
-    do {
-      ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms,
-                          sig_mask);
-      if (ep_rv < 0) {
-        if (errno != EINTR) {
-          /* TODO (sreek) - Do not log an error in case of bad file descriptor
-           * (A bad file descriptor here would just mean that the epoll set was
-           * merged with another epoll set and that the current epoll_fd is
-           * closed) */
-          gpr_log(GPR_ERROR, "epoll_pwait() failed: %s", strerror(errno));
-        } else {
-          ep_rv = epoll_wait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0);
-        }
+  do {
+    ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms,
+                        sig_mask);
+    if (ep_rv < 0) {
+      if (errno != EINTR) {
+        /* TODO (sreek) - Do not log an error in case of bad file descriptor
+         * (A bad file descriptor here would just mean that the epoll set was
+         * merged with another epoll set and that the current epoll_fd is
+         * closed) */
+        gpr_log(GPR_ERROR, "epoll_pwait() failed: %s", strerror(errno));
+      } else {
+        ep_rv = epoll_wait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0);
       }
+    }
 
-      int i;
-      for (i = 0; i < ep_rv; ++i) {
-        grpc_fd *fd = ep_ev[i].data.ptr;
-        int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP);
-        int read_ev = ep_ev[i].events & (EPOLLIN | EPOLLPRI);
-        int write_ev = ep_ev[i].events & EPOLLOUT;
-        if (fd == NULL) {
-          grpc_wakeup_fd_consume_wakeup(&grpc_global_wakeup_fd);
-        } else {
-          if (read_ev || cancel) {
-            fd_become_readable(exec_ctx, fd);
-          }
-          if (write_ev || cancel) {
-            fd_become_writable(exec_ctx, fd);
-          }
+    int i;
+    for (i = 0; i < ep_rv; ++i) {
+      grpc_fd *fd = ep_ev[i].data.ptr;
+      int cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP);
+      int read_ev = ep_ev[i].events & (EPOLLIN | EPOLLPRI);
+      int write_ev = ep_ev[i].events & EPOLLOUT;
+      if (fd == NULL) {
+        grpc_wakeup_fd_consume_wakeup(&grpc_global_wakeup_fd);
+      } else {
+        if (read_ev || cancel) {
+          fd_become_readable(exec_ctx, fd);
+        }
+        if (write_ev || cancel) {
+          fd_become_writable(exec_ctx, fd);
         }
       }
-    } while (ep_rv == GRPC_EPOLL_MAX_EVENTS);
-  }
+    }
+  } while (ep_rv == GRPC_EPOLL_MAX_EVENTS);
   GPR_TIMER_END("pollset_work_and_unlock", 0);
 }