From 2a42e55bb993a8ce4cbb795e8eedf38668a47710 Mon Sep 17 00:00:00 2001 From: vjpai Date: Thu, 24 Sep 2015 21:13:56 -0700 Subject: Don't annotate a blocking region on an epoll_wait that has 0 timeout --- src/core/iomgr/pollset_multipoller_with_epoll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core/iomgr') diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 65d1517291..47a8f37c80 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -197,9 +197,8 @@ static void multipoll_with_epoll_pollset_maybe_work( } if (pfds[1].revents) { do { - GRPC_SCHEDULING_START_BLOCKING_REGION; + /* The following epoll_wait never blocks; it has a timeout of 0 */ ep_rv = epoll_wait(h->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, 0); - GRPC_SCHEDULING_END_BLOCKING_REGION; if (ep_rv < 0) { if (errno != EINTR) { gpr_log(GPR_ERROR, "epoll_wait() failed: %s", strerror(errno)); -- cgit v1.2.3