diff options
author | Vijay Pai <vpai@google.com> | 2016-02-25 18:10:24 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-02-25 18:10:24 -0800 |
commit | e9ef53645150f7a0400a5f9be770eb2b4ba335b5 (patch) | |
tree | 34a8b7094b851589eec500b2ca419b64c9051d89 /src/core/iomgr/fd_posix.c | |
parent | e3cd25684051de21e4b1ba93173c06e72fa5ffad (diff) |
Revert "Add an implementation firewall against pollset_set"
Diffstat (limited to 'src/core/iomgr/fd_posix.c')
-rw-r--r-- | src/core/iomgr/fd_posix.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 4ba7c5df94..85eadd754b 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -46,8 +46,6 @@ #include <grpc/support/string_util.h> #include <grpc/support/useful.h> -#include "src/core/iomgr/pollset_posix.h" - #define CLOSURE_NOT_READY ((grpc_closure *)0) #define CLOSURE_READY ((grpc_closure *)1) @@ -177,11 +175,11 @@ int grpc_fd_is_orphaned(grpc_fd *fd) { } static void pollset_kick_locked(grpc_fd_watcher *watcher) { - gpr_mu_lock(&watcher->pollset->mu); + gpr_mu_lock(GRPC_POLLSET_MU(watcher->pollset)); GPR_ASSERT(watcher->worker); grpc_pollset_kick_ext(watcher->pollset, watcher->worker, GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); - gpr_mu_unlock(&watcher->pollset->mu); + gpr_mu_unlock(GRPC_POLLSET_MU(watcher->pollset)); } static void maybe_wake_one_watcher_locked(grpc_fd *fd) { |