aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar vjpai <vpai@google.com>2015-09-24 21:13:56 -0700
committerGravatar vjpai <vpai@google.com>2015-09-24 21:13:56 -0700
commit2a42e55bb993a8ce4cbb795e8eedf38668a47710 (patch)
tree62c36733f47372203af503a9ab1d873ccf442c13 /src
parent9839d285cd39d3fd2a16f3393f33e72f1e6b645b (diff)
Don't annotate a blocking region on an epoll_wait that has 0 timeout
Diffstat (limited to 'src')
-rw-r--r--src/core/iomgr/pollset_multipoller_with_epoll.c3
1 files changed, 1 insertions, 2 deletions
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));