| Index: mojo/public/platform/native/system_impl_private.h
|
| diff --git a/mojo/public/platform/native/system_impl_private.h b/mojo/public/platform/native/system_impl_private.h
|
| index 93ae4a473797ed30d4c45bb73153c97df1dbe0f6..eed7de63d9502d64070d500d62c9f62428e6b2a8 100644
|
| --- a/mojo/public/platform/native/system_impl_private.h
|
| +++ b/mojo/public/platform/native/system_impl_private.h
|
| @@ -7,7 +7,6 @@
|
| #ifndef MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_IMPL_PRIVATE_H_
|
| #define MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_IMPL_PRIVATE_H_
|
|
|
| -#include "mojo/public/c/system/system_export.h"
|
| #include "mojo/public/c/system/types.h"
|
|
|
| // This interface provides the Mojo system API, but with the ability to confine
|
| @@ -25,11 +24,11 @@ extern "C" {
|
|
|
| // Returns the MojoSystemImpl implicitly used by the non-SystemImpl version of
|
| // the Mojo sytem APIs.
|
| -MOJO_SYSTEM_EXPORT MojoSystemImpl MojoSystemImplGetDefaultImpl();
|
| +MojoSystemImpl MojoSystemImplGetDefaultImpl();
|
|
|
| // Creates and returns a new MojoSystemImpl. Currently there is no way to
|
| // destroy a MojoSystemImpl, once created.
|
| -MOJO_SYSTEM_EXPORT MojoSystemImpl MojoSystemImplCreateImpl();
|
| +MojoSystemImpl MojoSystemImplCreateImpl();
|
|
|
| // Moves a handle from one MojoSystemImpl to another.
|
| // On success, |result_handle| contains the name of the handle in the new
|
| @@ -39,107 +38,94 @@ MOJO_SYSTEM_EXPORT MojoSystemImpl MojoSystemImplCreateImpl();
|
| // Busy handles cannot be transfered.
|
| // To avoid trouble, this API should only be used to bootstrap a newly created
|
| // |to_system| with a newly created |handle|.
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplTransferHandle(MojoSystemImpl from_system,
|
| - MojoHandle handle,
|
| - MojoSystemImpl to_system,
|
| - MojoHandle* result_handle);
|
| +MojoResult MojoSystemImplTransferHandle(MojoSystemImpl from_system,
|
| + MojoHandle handle,
|
| + MojoSystemImpl to_system,
|
| + MojoHandle* result_handle);
|
|
|
| // APIs mirroring the Mojo system APIs, but also taking a MojoSystemImpl param.
|
| -MOJO_SYSTEM_EXPORT MojoTimeTicks
|
| -MojoSystemImplGetTimeTicksNow(MojoSystemImpl system);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplClose(MojoSystemImpl system, MojoHandle handle);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplWait(MojoSystemImpl system,
|
| - MojoHandle handle,
|
| - MojoHandleSignals signals,
|
| - MojoDeadline deadline,
|
| - struct MojoHandleSignalsState* signals_state);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplWaitMany(MojoSystemImpl system,
|
| - const MojoHandle* handles,
|
| - const MojoHandleSignals* signals,
|
| - uint32_t num_handles,
|
| - MojoDeadline deadline,
|
| - uint32_t* result_index,
|
| - struct MojoHandleSignalsState* signals_states);
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoSystemImplCreateMessagePipe(
|
| +MojoTimeTicks MojoSystemImplGetTimeTicksNow(MojoSystemImpl system);
|
| +MojoResult MojoSystemImplClose(MojoSystemImpl system, MojoHandle handle);
|
| +MojoResult MojoSystemImplWait(MojoSystemImpl system,
|
| + MojoHandle handle,
|
| + MojoHandleSignals signals,
|
| + MojoDeadline deadline,
|
| + struct MojoHandleSignalsState* signals_state);
|
| +MojoResult MojoSystemImplWaitMany(
|
| + MojoSystemImpl system,
|
| + const MojoHandle* handles,
|
| + const MojoHandleSignals* signals,
|
| + uint32_t num_handles,
|
| + MojoDeadline deadline,
|
| + uint32_t* result_index,
|
| + struct MojoHandleSignalsState* signals_states);
|
| +MojoResult MojoSystemImplCreateMessagePipe(
|
| MojoSystemImpl system,
|
| const struct MojoCreateMessagePipeOptions* options,
|
| MojoHandle* message_pipe_handle0,
|
| MojoHandle* message_pipe_handle1);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplWriteMessage(MojoSystemImpl system,
|
| - MojoHandle message_pipe_handle,
|
| - const void* bytes,
|
| - uint32_t num_bytes,
|
| - const MojoHandle* handles,
|
| - uint32_t num_handles,
|
| - MojoWriteMessageFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplReadMessage(MojoSystemImpl system,
|
| - MojoHandle message_pipe_handle,
|
| - void* bytes,
|
| - uint32_t* num_bytes,
|
| - MojoHandle* handles,
|
| - uint32_t* num_handles,
|
| - MojoReadMessageFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplCreateDataPipe(MojoSystemImpl system,
|
| - const struct MojoCreateDataPipeOptions* options,
|
| - MojoHandle* data_pipe_producer_handle,
|
| - MojoHandle* data_pipe_consumer_handle);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplWriteData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_producer_handle,
|
| - const void* elements,
|
| - uint32_t* num_elements,
|
| - MojoWriteDataFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplBeginWriteData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_producer_handle,
|
| - void** buffer,
|
| - uint32_t* buffer_num_elements,
|
| - MojoWriteDataFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplEndWriteData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_producer_handle,
|
| - uint32_t num_elements_written);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplReadData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_consumer_handle,
|
| - void* elements,
|
| - uint32_t* num_elements,
|
| - MojoReadDataFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplBeginReadData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_consumer_handle,
|
| - const void** buffer,
|
| - uint32_t* buffer_num_elements,
|
| - MojoReadDataFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplEndReadData(MojoSystemImpl system,
|
| - MojoHandle data_pipe_consumer_handle,
|
| - uint32_t num_elements_read);
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoSystemImplCreateSharedBuffer(
|
| +MojoResult MojoSystemImplWriteMessage(MojoSystemImpl system,
|
| + MojoHandle message_pipe_handle,
|
| + const void* bytes,
|
| + uint32_t num_bytes,
|
| + const MojoHandle* handles,
|
| + uint32_t num_handles,
|
| + MojoWriteMessageFlags flags);
|
| +MojoResult MojoSystemImplReadMessage(MojoSystemImpl system,
|
| + MojoHandle message_pipe_handle,
|
| + void* bytes,
|
| + uint32_t* num_bytes,
|
| + MojoHandle* handles,
|
| + uint32_t* num_handles,
|
| + MojoReadMessageFlags flags);
|
| +MojoResult MojoSystemImplCreateDataPipe(
|
| + MojoSystemImpl system,
|
| + const struct MojoCreateDataPipeOptions* options,
|
| + MojoHandle* data_pipe_producer_handle,
|
| + MojoHandle* data_pipe_consumer_handle);
|
| +MojoResult MojoSystemImplWriteData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_producer_handle,
|
| + const void* elements,
|
| + uint32_t* num_elements,
|
| + MojoWriteDataFlags flags);
|
| +MojoResult MojoSystemImplBeginWriteData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_producer_handle,
|
| + void** buffer,
|
| + uint32_t* buffer_num_elements,
|
| + MojoWriteDataFlags flags);
|
| +MojoResult MojoSystemImplEndWriteData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_producer_handle,
|
| + uint32_t num_elements_written);
|
| +MojoResult MojoSystemImplReadData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_consumer_handle,
|
| + void* elements,
|
| + uint32_t* num_elements,
|
| + MojoReadDataFlags flags);
|
| +MojoResult MojoSystemImplBeginReadData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_consumer_handle,
|
| + const void** buffer,
|
| + uint32_t* buffer_num_elements,
|
| + MojoReadDataFlags flags);
|
| +MojoResult MojoSystemImplEndReadData(MojoSystemImpl system,
|
| + MojoHandle data_pipe_consumer_handle,
|
| + uint32_t num_elements_read);
|
| +MojoResult MojoSystemImplCreateSharedBuffer(
|
| MojoSystemImpl system,
|
| const struct MojoCreateSharedBufferOptions* options,
|
| uint64_t num_bytes,
|
| MojoHandle* shared_buffer_handle);
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoSystemImplDuplicateBufferHandle(
|
| +MojoResult MojoSystemImplDuplicateBufferHandle(
|
| MojoSystemImpl system,
|
| MojoHandle buffer_handle,
|
| const struct MojoDuplicateBufferHandleOptions* options,
|
| MojoHandle* new_buffer_handle);
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoSystemImplMapBuffer(MojoSystemImpl system,
|
| - MojoHandle buffer_handle,
|
| - uint64_t offset,
|
| - uint64_t num_bytes,
|
| - void** buffer,
|
| - MojoMapBufferFlags flags);
|
| -MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoSystemImplUnmapBuffer(MojoSystemImpl system, void* buffer);
|
| +MojoResult MojoSystemImplMapBuffer(MojoSystemImpl system,
|
| + MojoHandle buffer_handle,
|
| + uint64_t offset,
|
| + uint64_t num_bytes,
|
| + void** buffer,
|
| + MojoMapBufferFlags flags);
|
| +MojoResult MojoSystemImplUnmapBuffer(MojoSystemImpl system, void* buffer);
|
|
|
| #ifdef __cplusplus
|
| } // extern "C"
|
|
|