diff options
author | Craig Tiller <ctiller@google.com> | 2015-08-04 09:01:36 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-08-04 09:01:36 -0700 |
commit | 82389ecf1a0f69183e3617e4f78b52c211463675 (patch) | |
tree | 72e6e228a3735bc362fb6365be82caf487a271ac /src/core/iomgr/fd_posix.c | |
parent | 0c23f29a297b18c334595cd2982f9728511062e4 (diff) | |
parent | 14a756545435b0212e8ef416f78877637311a57e (diff) |
Merge branch 'primary-goat-whisperer' into the-test-be-sleepy
Diffstat (limited to 'src/core/iomgr/fd_posix.c')
-rw-r--r-- | src/core/iomgr/fd_posix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 4fb6b46ea6..2d08a77a70 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -382,13 +382,15 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, return 0; } /* if there is nobody polling for read, but we need to, then start doing so */ - if (read_mask && !fd->read_watcher && gpr_atm_acq_load(&fd->readst) > READY) { + if (read_mask && !fd->read_watcher && + (gpr_uintptr)gpr_atm_acq_load(&fd->readst) > READY) { fd->read_watcher = watcher; mask |= read_mask; } /* if there is nobody polling for write, but we need to, then start doing so */ - if (write_mask && !fd->write_watcher && gpr_atm_acq_load(&fd->writest) > READY) { + if (write_mask && !fd->write_watcher && + (gpr_uintptr)gpr_atm_acq_load(&fd->writest) > READY) { fd->write_watcher = watcher; mask |= write_mask; } |