NaCl: create a separate namespace for Mojo handles.

mojo/public/platform/native/system_impl_private_thunks.h

Index: mojo/public/platform/native/system_impl_private_thunks.h
diff --git a/mojo/public/platform/native/system_impl_private_thunks.h b/mojo/public/platform/native/system_impl_private_thunks.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9690f2942c7afdd0096f30b94fd22359d3366ea
--- /dev/null
+++ b/mojo/public/platform/native/system_impl_private_thunks.h
@@ -0,0 +1,149 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Note: This header should be compilable as C.
+
+#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_IMPL_PRIVATE_THUNKS_H_
+#define MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_IMPL_PRIVATE_THUNKS_H_
+
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/platform/native/system_impl_private.h"
+
+// Structure used to bind the basic Mojo Core functions of a DSO to those of
+// the embedder.
+// This is the ABI between the embedder and the DSO. It can only have new
+// functions added to the end. No other changes are supported.
+#pragma pack(push, 8)
+struct MojoSystemImplThunksPrivate {
+  size_t size;  // Should be set to sizeof(MojoSystemImplThunks).
+  MojoSystemImpl (*GetDefaultSystemImpl)();
+  MojoSystemImpl (*CreateSystemImpl)();
+  MojoResult (*TransferHandle)(MojoSystemImpl from_system,
+                               MojoHandle handle,
+                               MojoSystemImpl to_system,
+                               MojoHandle* result_handle);
+};
+
+struct MojoExplicitSystemThunksPrivate {
+  size_t size;  // Should be set to sizeof(MojoExplicitThunksPrivate).
+  MojoTimeTicks (*GetTimeTicksNow)(MojoSystemImpl system);
+  MojoResult (*Close)(MojoSystemImpl system, MojoHandle handle);
+  MojoResult (*Wait)(MojoSystemImpl system,
+                     MojoHandle handle,
+                     MojoHandleSignals signals,
+                     MojoDeadline deadline,
+                     struct MojoHandleSignalsState* signals_state);
+  MojoResult (*WaitMany)(MojoSystemImpl system,
+                         const MojoHandle* handles,
+                         const MojoHandleSignals* signals,
+                         uint32_t num_handles,
+                         MojoDeadline deadline,
+                         uint32_t* result_index,
+                         struct MojoHandleSignalsState* signals_states);
+  MojoResult (*CreateMessagePipe)(
+      MojoSystemImpl system,
+      const struct MojoCreateMessagePipeOptions* options,
+      MojoHandle* message_pipe_handle0,
+      MojoHandle* message_pipe_handle1);
+  MojoResult (*WriteMessage)(MojoSystemImpl system,
+                             MojoHandle message_pipe_handle,
+                             const void* bytes,
+                             uint32_t num_bytes,
+                             const MojoHandle* handles,
+                             uint32_t num_handles,
+                             MojoWriteMessageFlags flags);
+  MojoResult (*ReadMessage)(MojoSystemImpl system,
+                            MojoHandle message_pipe_handle,
+                            void* bytes,
+                            uint32_t* num_bytes,
+                            MojoHandle* handles,
+                            uint32_t* num_handles,
+                            MojoReadMessageFlags flags);
+  MojoResult (*CreateDataPipe)(MojoSystemImpl system,
+                               const struct MojoCreateDataPipeOptions* options,
+                               MojoHandle* data_pipe_producer_handle,
+                               MojoHandle* data_pipe_consumer_handle);
+  MojoResult (*WriteData)(MojoSystemImpl system,
+                          MojoHandle data_pipe_producer_handle,
+                          const void* elements,
+                          uint32_t* num_elements,
+                          MojoWriteDataFlags flags);
+  MojoResult (*BeginWriteData)(MojoSystemImpl system,
+                               MojoHandle data_pipe_producer_handle,
+                               void** buffer,
+                               uint32_t* buffer_num_elements,
+                               MojoWriteDataFlags flags);
+  MojoResult (*EndWriteData)(MojoSystemImpl system,
+                             MojoHandle data_pipe_producer_handle,
+                             uint32_t num_elements_written);
+  MojoResult (*ReadData)(MojoSystemImpl system,
+                         MojoHandle data_pipe_consumer_handle,
+                         void* elements,
+                         uint32_t* num_elements,
+                         MojoReadDataFlags flags);
+  MojoResult (*BeginReadData)(MojoSystemImpl system,
+                              MojoHandle data_pipe_consumer_handle,
+                              const void** buffer,
+                              uint32_t* buffer_num_elements,
+                              MojoReadDataFlags flags);
+  MojoResult (*EndReadData)(MojoSystemImpl system,
+                            MojoHandle data_pipe_consumer_handle,
+                            uint32_t num_elements_read);
+  MojoResult (*CreateSharedBuffer)(
+      MojoSystemImpl system,
+      const struct MojoCreateSharedBufferOptions* options,
+      uint64_t num_bytes,
+      MojoHandle* shared_buffer_handle);
+  MojoResult (*DuplicateBufferHandle)(
+      MojoSystemImpl system,
+      MojoHandle buffer_handle,
+      const struct MojoDuplicateBufferHandleOptions* options,
+      MojoHandle* new_buffer_handle);
+  MojoResult (*MapBuffer)(MojoSystemImpl system,
+                          MojoHandle buffer_handle,
+                          uint64_t offset,
+                          uint64_t num_bytes,
+                          void** buffer,
+                          MojoMapBufferFlags flags);
+  MojoResult (*UnmapBuffer)(MojoSystemImpl system, void* buffer);
+};
+#pragma pack(pop)
+
+#ifdef __cplusplus
+inline MojoSystemImplThunksPrivate MojoMakeSystemImplThunksPrivate() {

[viettrungluu, 2015/04/06 23:21:02]

Do you really need two thunk tables?

+  MojoSystemImplThunksPrivate system_thunks = {
+      sizeof(MojoSystemImplThunksPrivate),
+      MojoSystemImplGetDefaultImpl,
+      MojoSystemImplCreateImpl,
+      MojoSystemImplTransferHandle};
+  return system_thunks;
+}
+
+inline MojoExplicitSystemThunksPrivate MojoMakeExplicitSystemThunksPrivate() {
+  MojoExplicitSystemThunksPrivate system_thunks = {
+      sizeof(MojoExplicitSystemThunksPrivate),
+      MojoSystemImplGetTimeTicksNow,
+      MojoSystemImplClose,
+      MojoSystemImplWait,
+      MojoSystemImplWaitMany,
+      MojoSystemImplCreateMessagePipe,
+      MojoSystemImplWriteMessage,
+      MojoSystemImplReadMessage,
+      MojoSystemImplCreateDataPipe,
+      MojoSystemImplWriteData,
+      MojoSystemImplBeginWriteData,
+      MojoSystemImplEndWriteData,
+      MojoSystemImplReadData,
+      MojoSystemImplBeginReadData,
+      MojoSystemImplEndReadData,
+      MojoSystemImplCreateSharedBuffer,
+      MojoSystemImplDuplicateBufferHandle,
+      MojoSystemImplMapBuffer,
+      MojoSystemImplUnmapBuffer};
+  return system_thunks;
+}
+
+#endif
+
+#endif  // MOJO_PUBLIC_PLATFORM_NATIVE_SYSTEM_IMPL_PRIVATE_THUNKS_H_