Merge pull request #7905 from vjpai/epoll_blocks

Mark epoll_{,p}wait as blocking regions if they have a timeout
9 years ago · 6e34f81f38
parent b50eea8669 cef5401b2e
commit 6e34f81f38
1 changed files with 2 additions and 0 deletions
--- 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,