diff options
Diffstat (limited to 'mojo/public/system')
| -rw-r--r-- | mojo/public/system/core.h | 9 | ||||
| -rw-r--r-- | mojo/public/system/core_private.cc | 9 | ||||
| -rw-r--r-- | mojo/public/system/core_private.h | 7 |
3 files changed, 15 insertions, 10 deletions
diff --git a/mojo/public/system/core.h b/mojo/public/system/core.h index dc71ae2..8d4cb02 100644 --- a/mojo/public/system/core.h +++ b/mojo/public/system/core.h @@ -406,8 +406,8 @@ MOJO_SYSTEM_EXPORT MojoResult MojoReadMessage(MojoHandle message_pipe_handle, MOJO_SYSTEM_EXPORT MojoResult MojoCreateDataPipe( const struct MojoCreateDataPipeOptions* options, - MojoHandle* producer_handle, - MojoHandle* consumer_handle); + MojoHandle* data_pipe_producer_handle, + MojoHandle* data_pipe_consumer_handle); MOJO_SYSTEM_EXPORT MojoResult MojoWriteData( MojoHandle data_pipe_producer_handle, @@ -415,6 +415,11 @@ MOJO_SYSTEM_EXPORT MojoResult MojoWriteData( uint32_t* num_elements, MojoWriteDataFlags flags); +// TODO(vtl): Note to self: |buffer_num_elements| is an "in-out" parameter: +// on the "in" side, |*buffer_num_elements| is the number requested; on success, +// on the "out" side, it's the number available (which may be GREATER or LESS +// than the number requested; if the "all-or-nothing" flag is set, it's AT LEAST +// the number requested). MOJO_SYSTEM_EXPORT MojoResult MojoBeginWriteData( MojoHandle data_pipe_producer_handle, void** buffer, diff --git a/mojo/public/system/core_private.cc b/mojo/public/system/core_private.cc index 702ce48..12f819b 100644 --- a/mojo/public/system/core_private.cc +++ b/mojo/public/system/core_private.cc @@ -65,11 +65,12 @@ MojoResult MojoReadMessage(MojoHandle message_pipe_handle, num_handles, flags); } -MojoResult MojoCreateDataPipe(const struct MojoCreateDataPipeOptions* options, - MojoHandle* producer_handle, - MojoHandle* consumer_handle) { +MojoResult MojoCreateDataPipe(const MojoCreateDataPipeOptions* options, + MojoHandle* data_pipe_producer_handle, + MojoHandle* data_pipe_consumer_handle) { assert(g_core); - return g_core->CreateDataPipe(options, producer_handle, consumer_handle); + return g_core->CreateDataPipe(options, data_pipe_producer_handle, + data_pipe_consumer_handle); } MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle, diff --git a/mojo/public/system/core_private.h b/mojo/public/system/core_private.h index 1095e98..6df7245 100644 --- a/mojo/public/system/core_private.h +++ b/mojo/public/system/core_private.h @@ -41,10 +41,9 @@ class MOJO_SYSTEM_EXPORT CorePrivate { MojoHandle* handles, uint32_t* num_handles, MojoReadMessageFlags flags) = 0; - virtual MojoResult CreateDataPipe( - const struct MojoCreateDataPipeOptions* options, - MojoHandle* producer_handle, - MojoHandle* consumer_handle) = 0; + virtual MojoResult CreateDataPipe(const MojoCreateDataPipeOptions* options, + MojoHandle* data_pipe_producer_handle, + MojoHandle* data_pipe_consumer_handle) = 0; virtual MojoResult WriteData(MojoHandle data_pipe_producer_handle, const void* elements, uint32_t* num_elements, |