| Index: mojo/edk/system/local_data_pipe_impl.cc
|
| diff --git a/mojo/edk/system/local_data_pipe_impl.cc b/mojo/edk/system/local_data_pipe_impl.cc
|
| index 0aa0466c0e68376dc827b8974c3546b0c6d2aa26..7c05c2248eba5d23500c9ff2c66f833fc5ed92cc 100644
|
| --- a/mojo/edk/system/local_data_pipe_impl.cc
|
| +++ b/mojo/edk/system/local_data_pipe_impl.cc
|
| @@ -314,16 +314,27 @@ MojoResult LocalDataPipeImpl::ConsumerEndReadData(uint32_t num_bytes_read) {
|
|
|
| HandleSignalsState LocalDataPipeImpl::ConsumerGetHandleSignalsState() const {
|
| HandleSignalsState rv;
|
| - if (current_num_bytes_ > 0) {
|
| + // |consumer_read_threshold_num_bytes()| is always at least 1.
|
| + if (current_num_bytes_ >= consumer_read_threshold_num_bytes()) {
|
| + if (!consumer_in_two_phase_read()) {
|
| + rv.satisfied_signals |=
|
| + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_READ_THRESHOLD;
|
| + }
|
| + rv.satisfiable_signals |=
|
| + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_READ_THRESHOLD;
|
| + } else if (current_num_bytes_ > 0u) {
|
| if (!consumer_in_two_phase_read())
|
| rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_READABLE;
|
| rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE;
|
| - } else if (producer_open()) {
|
| - rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE;
|
| }
|
| - if (!producer_open())
|
| + if (producer_open()) {
|
| + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE |
|
| + MOJO_HANDLE_SIGNAL_PEER_CLOSED |
|
| + MOJO_HANDLE_SIGNAL_READ_THRESHOLD;
|
| + } else {
|
| rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
|
| - rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
|
| + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
|
| + }
|
| return rv;
|
| }
|
|
|
|
|