Merge pull request grpc#7905 from vjpai/epoll_blocks

Mark epoll_{,p}wait as blocking regions if they have a timeout
eagletmt · Aug 29, 2016 · 6e34f81 · 6e34f81
2 parents b50eea8 + cef5401
commit 6e34f81
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c
@@ -1353,8 +1353,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx,
   gpr_mu_unlock(&pollset->mu);
 
   do {
+    GRPC_SCHEDULING_START_BLOCKING_REGION;
     ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms,
                         sig_mask);
+    GRPC_SCHEDULING_END_BLOCKING_REGION;
     if (ep_rv < 0) {
       if (errno != EINTR) {
         gpr_asprintf(&err_msg,