| Index: mojo/edk/system/dispatcher.cc
|
| diff --git a/mojo/edk/system/dispatcher.cc b/mojo/edk/system/dispatcher.cc
|
| index f6bc98eb2f26629c9073ec29958a4af329c50b7c..1c98a99f5b2684ceb868a802cdba296b73f58603 100644
|
| --- a/mojo/edk/system/dispatcher.cc
|
| +++ b/mojo/edk/system/dispatcher.cc
|
| @@ -168,6 +168,25 @@ MojoResult Dispatcher::EndWriteData(uint32_t num_bytes_written) {
|
| return EndWriteDataImplNoLock(num_bytes_written);
|
| }
|
|
|
| +MojoResult Dispatcher::SetDataPipeConsumerOptions(
|
| + UserPointer<const MojoDataPipeConsumerOptions> options) {
|
| + MutexLocker locker(&mutex_);
|
| + if (is_closed_)
|
| + return MOJO_RESULT_INVALID_ARGUMENT;
|
| +
|
| + return SetDataPipeConsumerOptionsImplNoLock(options);
|
| +}
|
| +
|
| +MojoResult Dispatcher::GetDataPipeConsumerOptions(
|
| + UserPointer<MojoDataPipeConsumerOptions> options,
|
| + uint32_t options_num_bytes) {
|
| + MutexLocker locker(&mutex_);
|
| + if (is_closed_)
|
| + return MOJO_RESULT_INVALID_ARGUMENT;
|
| +
|
| + return GetDataPipeConsumerOptionsImplNoLock(options, options_num_bytes);
|
| +}
|
| +
|
| MojoResult Dispatcher::ReadData(UserPointer<void> elements,
|
| UserPointer<uint32_t> num_bytes,
|
| MojoReadDataFlags flags) {
|
| @@ -342,6 +361,21 @@ MojoResult Dispatcher::ReadDataImplNoLock(UserPointer<void> /*elements*/,
|
| return MOJO_RESULT_INVALID_ARGUMENT;
|
| }
|
|
|
| +MojoResult Dispatcher::SetDataPipeConsumerOptionsImplNoLock(
|
| + UserPointer<const MojoDataPipeConsumerOptions> /*options*/) {
|
| + mutex_.AssertHeld();
|
| + DCHECK(!is_closed_);
|
| + return MOJO_RESULT_INVALID_ARGUMENT;
|
| +}
|
| +
|
| +MojoResult Dispatcher::GetDataPipeConsumerOptionsImplNoLock(
|
| + UserPointer<MojoDataPipeConsumerOptions> /*options*/,
|
| + uint32_t /*options_num_bytes*/) {
|
| + mutex_.AssertHeld();
|
| + DCHECK(!is_closed_);
|
| + return MOJO_RESULT_INVALID_ARGUMENT;
|
| +}
|
| +
|
| MojoResult Dispatcher::BeginReadDataImplNoLock(
|
| UserPointer<const void*> /*buffer*/,
|
| UserPointer<uint32_t> /*buffer_num_bytes*/,
|
|
|