Implement MojoGetBufferInformation(), part 3.

mojo/public/platform/nacl/libmojo.cc

Index: mojo/public/platform/nacl/libmojo.cc
diff --git a/mojo/public/platform/nacl/libmojo.cc b/mojo/public/platform/nacl/libmojo.cc
index 7a9e6b6dd33bbe94ca9b6c399e89001929a6bf51..f217b0c88dca7070cccc18c2da838cdefde044ea 100644
--- a/mojo/public/platform/nacl/libmojo.cc
+++ b/mojo/public/platform/nacl/libmojo.cc
@@ -26,45 +26,85 @@ struct nacl_irt_mojo* get_irt_mojo() {
   return &g_irt_mojo;
 }
 
-MojoResult MojoCreateSharedBuffer(
-    const struct MojoCreateSharedBufferOptions* options,
-    uint64_t num_bytes,
-    MojoHandle* shared_buffer_handle) {
+MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoCreateSharedBuffer(options, num_bytes,
-                                          shared_buffer_handle);
+  return irt_mojo->_MojoGetInitialHandle(handle);
 }
 
-MojoResult MojoDuplicateBufferHandle(
-    MojoHandle buffer_handle,
-    const struct MojoDuplicateBufferHandleOptions* options,
-    MojoHandle* new_buffer_handle) {
+MojoTimeTicks MojoGetTimeTicksNow() {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoDuplicateBufferHandle(buffer_handle, options,
-                                             new_buffer_handle);
+  return irt_mojo->MojoGetTimeTicksNow();
 }
 
-MojoResult MojoMapBuffer(MojoHandle buffer_handle,
-                         uint64_t offset,
-                         uint64_t num_bytes,
-                         void** buffer,
-                         MojoMapBufferFlags flags) {
+MojoResult MojoClose(MojoHandle handle) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoMapBuffer(buffer_handle, offset, num_bytes, buffer,
-                                 flags);
+  return irt_mojo->MojoClose(handle);
 }
 
-MojoResult MojoUnmapBuffer(void* buffer) {
+MojoResult MojoWait(MojoHandle handle,
+                    MojoHandleSignals signals,
+                    MojoDeadline deadline,
+                    struct MojoHandleSignalsState* signals_state) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoUnmapBuffer(buffer);
+  return irt_mojo->MojoWait(handle, signals, deadline, signals_state);
+}
+
+MojoResult MojoWaitMany(const MojoHandle* handles,
+                        const MojoHandleSignals* signals,
+                        uint32_t num_handles,
+                        MojoDeadline deadline,
+                        uint32_t* result_index,
+                        struct MojoHandleSignalsState* signals_states) {
+  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
+  if (!irt_mojo)
+    abort();
+  return irt_mojo->MojoWaitMany(handles, signals, num_handles, deadline,
+                                result_index, signals_states);
+}
+
+MojoResult MojoCreateMessagePipe(
+    const struct MojoCreateMessagePipeOptions* options,
+    MojoHandle* message_pipe_handle0,
+    MojoHandle* message_pipe_handle1) {
+  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
+  if (!irt_mojo)
+    abort();
+  return irt_mojo->MojoCreateMessagePipe(options, message_pipe_handle0,
+                                         message_pipe_handle1);
+}
+
+MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
+                            const void* bytes,
+                            uint32_t num_bytes,
+                            const MojoHandle* handles,
+                            uint32_t num_handles,
+                            MojoWriteMessageFlags flags) {
+  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
+  if (!irt_mojo)
+    abort();
+  return irt_mojo->MojoWriteMessage(message_pipe_handle, bytes, num_bytes,
+                                    handles, num_handles, flags);
+}
+
+MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
+                           void* bytes,
+                           uint32_t* num_bytes,
+                           MojoHandle* handles,
+                           uint32_t* num_handles,
+                           MojoReadMessageFlags flags) {
+  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
+  if (!irt_mojo)
+    abort();
+  return irt_mojo->MojoReadMessage(message_pipe_handle, bytes, num_bytes,
+                                   handles, num_handles, flags);
 }
 
 MojoResult MojoCreateDataPipe(const struct MojoCreateDataPipeOptions* options,
@@ -138,84 +178,54 @@ MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
   return irt_mojo->MojoEndReadData(data_pipe_consumer_handle, num_bytes_read);
 }
 
-MojoTimeTicks MojoGetTimeTicksNow() {
-  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
-  if (!irt_mojo)
-    abort();
-  return irt_mojo->MojoGetTimeTicksNow();
-}
-
-MojoResult MojoClose(MojoHandle handle) {
-  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
-  if (!irt_mojo)
-    abort();
-  return irt_mojo->MojoClose(handle);
-}
-
-MojoResult MojoWait(MojoHandle handle,
-                    MojoHandleSignals signals,
-                    MojoDeadline deadline,
-                    struct MojoHandleSignalsState* signals_state) {
-  struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
-  if (!irt_mojo)
-    abort();
-  return irt_mojo->MojoWait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoWaitMany(const MojoHandle* handles,
-                        const MojoHandleSignals* signals,
-                        uint32_t num_handles,
-                        MojoDeadline deadline,
-                        uint32_t* result_index,
-                        struct MojoHandleSignalsState* signals_states) {
+MojoResult MojoCreateSharedBuffer(
+    const struct MojoCreateSharedBufferOptions* options,
+    uint64_t num_bytes,
+    MojoHandle* shared_buffer_handle) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoWaitMany(handles, signals, num_handles, deadline,
-                                result_index, signals_states);
+  return irt_mojo->MojoCreateSharedBuffer(options, num_bytes,
+                                          shared_buffer_handle);
 }
 
-MojoResult MojoCreateMessagePipe(
-    const struct MojoCreateMessagePipeOptions* options,
-    MojoHandle* message_pipe_handle0,
-    MojoHandle* message_pipe_handle1) {
+MojoResult MojoDuplicateBufferHandle(
+    MojoHandle buffer_handle,
+    const struct MojoDuplicateBufferHandleOptions* options,
+    MojoHandle* new_buffer_handle) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoCreateMessagePipe(options, message_pipe_handle0,
-                                         message_pipe_handle1);
+  return irt_mojo->MojoDuplicateBufferHandle(buffer_handle, options,
+                                             new_buffer_handle);
 }
 
-MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
-                            const void* bytes,
-                            uint32_t num_bytes,
-                            const MojoHandle* handles,
-                            uint32_t num_handles,
-                            MojoWriteMessageFlags flags) {
+MojoResult MojoGetBufferInformation(MojoHandle buffer_handle,
+                                    struct MojoBufferInformation* info,
+                                    uint32_t info_num_bytes) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoWriteMessage(message_pipe_handle, bytes, num_bytes,
-                                    handles, num_handles, flags);
+  return irt_mojo->MojoGetBufferInformation(buffer_handle, info,
+                                            info_num_bytes);
 }
 
-MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
-                           void* bytes,
-                           uint32_t* num_bytes,
-                           MojoHandle* handles,
-                           uint32_t* num_handles,
-                           MojoReadMessageFlags flags) {
+MojoResult MojoMapBuffer(MojoHandle buffer_handle,
+                         uint64_t offset,
+                         uint64_t num_bytes,
+                         void** buffer,
+                         MojoMapBufferFlags flags) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->MojoReadMessage(message_pipe_handle, bytes, num_bytes,
-                                   handles, num_handles, flags);
+  return irt_mojo->MojoMapBuffer(buffer_handle, offset, num_bytes, buffer,
+                                 flags);
 }
 
-MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
+MojoResult MojoUnmapBuffer(void* buffer) {
   struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
   if (!irt_mojo)
     abort();
-  return irt_mojo->_MojoGetInitialHandle(handle);
+  return irt_mojo->MojoUnmapBuffer(buffer);
 }