diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
| commit | f173793e51e726a887b84b4c37588e2e308191cc (patch) | |
| tree | 0c03feb8ebdb68a99c51d3f24c3aa39755f14793 /src/core/iomgr/pollset_multipoller_with_poll_posix.c | |
| parent | 882d7a7eec148046a90e1d111b93e353e3df0c31 (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into travis-speedup
Conflicts:
.travis.yml
Diffstat (limited to 'src/core/iomgr/pollset_multipoller_with_poll_posix.c')
| -rw-r--r-- | src/core/iomgr/pollset_multipoller_with_poll_posix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 7570ff18c5..25b7cfda1a 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -172,6 +172,9 @@ static int multipoll_with_poll_pollset_maybe_work( } r = poll(h->pfds, h->pfd_count, timeout); + + end_polling(pollset); + if (r < 0) { if (errno != EINTR) { gpr_log(GPR_ERROR, "poll() failed: %s", strerror(errno)); @@ -192,7 +195,6 @@ static int multipoll_with_poll_pollset_maybe_work( } } grpc_pollset_kick_post_poll(&pollset->kick_state); - end_polling(pollset); gpr_mu_lock(&pollset->mu); pollset->counter = 0; @@ -201,7 +203,7 @@ static int multipoll_with_poll_pollset_maybe_work( } static void multipoll_with_poll_pollset_kick(grpc_pollset *p) { - grpc_pollset_kick_kick(&p->kick_state); + grpc_pollset_force_kick(p); } static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { |