diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-05-29 14:04:21 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-05-29 14:04:21 -0700 |
| commit | a07d50389ce0d818eaf080b4c0576bde012db59a (patch) | |
| tree | 10ae7d336cf2b2446cd55be84e68fa0f59fc8278 /src/core/iomgr | |
| parent | 4d63da6910c60b8fd68cae5cb54bb8985dd1e4c3 (diff) | |
| parent | 8f17c6c0283aeb78b615580529e98f1a28bf3c77 (diff) | |
Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup
Diffstat (limited to 'src/core/iomgr')
| -rw-r--r-- | src/core/iomgr/pollset_multipoller_with_epoll.c | 5 | ||||
| -rw-r--r-- | src/core/iomgr/pollset_multipoller_with_poll_posix.c | 6 | ||||
| -rw-r--r-- | src/core/iomgr/pollset_posix.h | 9 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index abc8b091ba..bd9361e229 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -190,6 +190,7 @@ static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, } } -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = epoll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + epoll_become_multipoller; -#endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ +#endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 24339a39bb..9f137e48cd 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -98,7 +98,8 @@ static void end_polling(grpc_pollset *pollset) { pollset_hdr *h; h = pollset->data.ptr; for (i = 1; i < h->pfd_count; i++) { - grpc_fd_end_poll(&h->watchers[i], h->pfds[i].revents & POLLIN, h->pfds[i].revents & POLLOUT); + grpc_fd_end_poll(&h->watchers[i], h->pfds[i].revents & POLLIN, + h->pfds[i].revents & POLLOUT); } } @@ -251,5 +252,6 @@ void grpc_poll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, #endif /* GPR_POSIX_SOCKET */ #ifdef GPR_POSIX_MULTIPOLL_WITH_POLL -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = grpc_poll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + grpc_poll_become_multipoller; #endif diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 54b38fbbdc..58c7b3ea1a 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -94,10 +94,11 @@ void grpc_kick_drain(grpc_pollset *p); /* turn a pollset into a multipoller: platform specific */ typedef void (*grpc_platform_become_multipoller_type)(grpc_pollset *pollset, - struct grpc_fd **fds, size_t fd_count); + struct grpc_fd **fds, + size_t fd_count); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; -void grpc_poll_become_multipoller(grpc_pollset *pollset, - struct grpc_fd **fds, size_t fd_count); +void grpc_poll_become_multipoller(grpc_pollset *pollset, struct grpc_fd **fds, + size_t fd_count); -#endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ +#endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ |