diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-18 12:51:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-18 12:51:05 -0700 |
| commit | 128f4a9cfe34825543dab4e29c875b59af40e666 (patch) | |
| tree | 323e79e6d7dd98ef6aa23f93ec20736d10abd9ce /src/core/iomgr/pollset_multipoller_with_poll_posix.c | |
| parent | f2066040d2568e6ae90f6690fab91c63cd17fd6b (diff) | |
| parent | 4f21d3549c8f652a152ae086a74dd8415ecca8fa (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Diffstat (limited to 'src/core/iomgr/pollset_multipoller_with_poll_posix.c')
| -rw-r--r-- | src/core/iomgr/pollset_multipoller_with_poll_posix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 388b2d2a8a..30ee6e24db 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -74,7 +74,7 @@ static void multipoll_with_poll_pollset_add_fd(grpc_pollset *pollset, } h->fds[h->fd_count++] = fd; GRPC_FD_REF(fd, "multipoller"); -exit: +exit: if (and_unlock_pollset) { gpr_mu_unlock(&pollset->mu); } @@ -202,8 +202,7 @@ static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { } static const grpc_pollset_vtable multipoll_with_poll_pollset = { - multipoll_with_poll_pollset_add_fd, - multipoll_with_poll_pollset_del_fd, + multipoll_with_poll_pollset_add_fd, multipoll_with_poll_pollset_del_fd, multipoll_with_poll_pollset_maybe_work, multipoll_with_poll_pollset_finish_shutdown, multipoll_with_poll_pollset_destroy}; |