Make mojo_system static and mojo_system_impl a component, never use both

mojo/public/platform/native/mojo_core.cc

Index: mojo/public/platform/native/mojo_core.cc
diff --git a/mojo/public/system/core_private.cc b/mojo/public/platform/native/mojo_core.cc
similarity index 61%
rename from mojo/public/system/core_private.cc
rename to mojo/public/platform/native/mojo_core.cc
index bd9d6b85fdf2579037c392f0b4b43428d4da0265..fa8e1b240fd604873e69d0bc8fb729cbcadfd3a4 100644
--- a/mojo/public/system/core_private.cc
+++ b/mojo/public/platform/native/mojo_core.cc
@@ -2,44 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/system/core_private.h"
+#include "mojo/public/platform/native/mojo_core.h"
 
 #include <assert.h>
 #include <stddef.h>
 
-static mojo::Core* g_core = NULL;
-
 extern "C" {
 
+static MojoCore g_core = {0};
+
 MojoTimeTicks MojoGetTimeTicksNow() {
-  assert(g_core);
-  return g_core->GetTimeTicksNow();
+  assert(g_core.GetTimeTicksNow);
+  return g_core.GetTimeTicksNow();
 }
 
 MojoResult MojoClose(MojoHandle handle) {
-  assert(g_core);
-  return g_core->Close(handle);
+  assert(g_core.Close);
+  return g_core.Close(handle);
 }
 
 MojoResult MojoWait(MojoHandle handle,
                     MojoWaitFlags flags,
                     MojoDeadline deadline) {
-  assert(g_core);
-  return g_core->Wait(handle, flags, deadline);
+  assert(g_core.Wait);
+  return g_core.Wait(handle, flags, deadline);
 }
 
 MojoResult MojoWaitMany(const MojoHandle* handles,
                         const MojoWaitFlags* flags,
                         uint32_t num_handles,
                         MojoDeadline deadline) {
-  assert(g_core);
-  return g_core->WaitMany(handles, flags, num_handles, deadline);
+  assert(g_core.WaitMany);
+  return g_core.WaitMany(handles, flags, num_handles, deadline);
 }
 
 MojoResult MojoCreateMessagePipe(MojoHandle* message_pipe_handle0,
                                  MojoHandle* message_pipe_handle1) {
-  assert(g_core);
-  return g_core->CreateMessagePipe(message_pipe_handle0, message_pipe_handle1);
+  assert(g_core.CreateMessagePipe);
+  return g_core.CreateMessagePipe(message_pipe_handle0, message_pipe_handle1);
 }
 
 MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
@@ -48,9 +48,9 @@ MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
                             const MojoHandle* handles,
                             uint32_t num_handles,
                             MojoWriteMessageFlags flags) {
-  assert(g_core);
-  return g_core->WriteMessage(message_pipe_handle, bytes, num_bytes, handles,
-                              num_handles, flags);
+  assert(g_core.WriteMessage);
+  return g_core.WriteMessage(message_pipe_handle, bytes, num_bytes, handles,
+                             num_handles, flags);
 }
 
 MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
@@ -59,82 +59,82 @@ MojoResult MojoReadMessage(MojoHandle message_pipe_handle,
                            MojoHandle* handles,
                            uint32_t* num_handles,
                            MojoReadMessageFlags flags) {
-  assert(g_core);
-  return g_core->ReadMessage(message_pipe_handle, bytes, num_bytes, handles,
-                             num_handles, flags);
+  assert(g_core.ReadMessage);
+  return g_core.ReadMessage(message_pipe_handle, bytes, num_bytes, handles,
+                            num_handles, flags);
 }
 
 MojoResult MojoCreateDataPipe(const MojoCreateDataPipeOptions* options,
                               MojoHandle* data_pipe_producer_handle,
                               MojoHandle* data_pipe_consumer_handle) {
-  assert(g_core);
-  return g_core->CreateDataPipe(options, data_pipe_producer_handle,
-                                data_pipe_consumer_handle);
+  assert(g_core.CreateDataPipe);
+  return g_core.CreateDataPipe(options, data_pipe_producer_handle,
+                               data_pipe_consumer_handle);
 }
 
 MojoResult MojoWriteData(MojoHandle data_pipe_producer_handle,
                          const void* elements,
                          uint32_t* num_elements,
                          MojoWriteDataFlags flags) {
-  assert(g_core);
-  return g_core->WriteData(data_pipe_producer_handle, elements, num_elements,
-                           flags);
+  assert(g_core.WriteData);
+  return g_core.WriteData(data_pipe_producer_handle, elements, num_elements,
+                          flags);
 }
 
 MojoResult MojoBeginWriteData(MojoHandle data_pipe_producer_handle,
                               void** buffer,
                               uint32_t* buffer_num_elements,
                               MojoWriteDataFlags flags) {
-  assert(g_core);
-  return g_core->BeginWriteData(data_pipe_producer_handle, buffer,
-                                buffer_num_elements, flags);
+  assert(g_core.BeginWriteData);
+  return g_core.BeginWriteData(data_pipe_producer_handle, buffer,
+                               buffer_num_elements, flags);
 }
 
 MojoResult MojoEndWriteData(MojoHandle data_pipe_producer_handle,
                             uint32_t num_elements_written) {
-  assert(g_core);
-  return g_core->EndWriteData(data_pipe_producer_handle, num_elements_written);
+  assert(g_core.EndWriteData);
+  return g_core.EndWriteData(data_pipe_producer_handle, num_elements_written);
 }
 
 MojoResult MojoReadData(MojoHandle data_pipe_consumer_handle,
                         void* elements,
                         uint32_t* num_elements,
                         MojoReadDataFlags flags) {
-  assert(g_core);
-  return g_core->ReadData(data_pipe_consumer_handle, elements, num_elements,
-                          flags);
+  assert(g_core.ReadData);
+  return g_core.ReadData(data_pipe_consumer_handle, elements, num_elements,
+                         flags);
 }
 
 MojoResult MojoBeginReadData(MojoHandle data_pipe_consumer_handle,
                              const void** buffer,
                              uint32_t* buffer_num_elements,
                              MojoReadDataFlags flags) {
-  assert(g_core);
-  return g_core->BeginReadData(data_pipe_consumer_handle, buffer,
-                               buffer_num_elements, flags);
+  assert(g_core.BeginReadData);
+  return g_core.BeginReadData(data_pipe_consumer_handle, buffer,
+                              buffer_num_elements, flags);
 }
 
 MojoResult MojoEndReadData(MojoHandle data_pipe_consumer_handle,
                            uint32_t num_elements_read) {
-  assert(g_core);
-  return g_core->EndReadData(data_pipe_consumer_handle, num_elements_read);
+  assert(g_core.EndReadData);
+  return g_core.EndReadData(data_pipe_consumer_handle, num_elements_read);
 }
 
 MojoResult MojoCreateSharedBuffer(
     const struct MojoCreateSharedBufferOptions* options,
     uint64_t num_bytes,
     MojoHandle* shared_buffer_handle) {
-  assert(g_core);
-  return g_core->CreateSharedBuffer(options, num_bytes, shared_buffer_handle);
+  assert(g_core.CreateSharedBuffer);
+  return g_core.CreateSharedBuffer(options, num_bytes, shared_buffer_handle);
 }
 
 MojoResult MojoDuplicateBufferHandle(
     MojoHandle buffer_handle,
     const struct MojoDuplicateBufferHandleOptions* options,
     MojoHandle* new_buffer_handle) {
-  assert(g_core);
-  return g_core->DuplicateBufferHandle(buffer_handle, options,
-                                       new_buffer_handle);
+  assert(g_core.DuplicateBufferHandle);
+  return g_core.DuplicateBufferHandle(buffer_handle, options,
+                                      new_buffer_handle);
 }
 
 MojoResult MojoMapBuffer(MojoHandle buffer_handle,
@@ -142,36 +142,22 @@ MojoResult MojoMapBuffer(MojoHandle buffer_handle,
                          uint64_t num_bytes,
                          void** buffer,
                          MojoMapBufferFlags flags) {
-  assert(g_core);
-  return g_core->MapBuffer(buffer_handle, offset, num_bytes, buffer, flags);
+  assert(g_core.MapBuffer);
+  return g_core.MapBuffer(buffer_handle, offset, num_bytes, buffer, flags);
 }
 
 MojoResult MojoUnmapBuffer(void* buffer) {
-  assert(g_core);
-  return g_core->UnmapBuffer(buffer);
-}
-
-}  // extern "C"
-
-namespace mojo {
-
-Core::~Core() {
+  assert(g_core.UnmapBuffer);
+  return g_core.UnmapBuffer(buffer);
 }
 
-// static
-void Core::Init(Core* core) {
-  assert(!g_core);
-  g_core = core;
+MojoResult SetMojoCore(MojoCore* mojo_core) {
+  if (mojo_core->size < sizeof(g_core)) {
+    mojo_core->size = sizeof(g_core);

[viettrungluu, 2014/04/09 20:52:23]

This seems like a bad idea. I think it should take a const MojoCore* argument,
and report the size separately.

(Otherwise, the caller can't have a common (possibly global const) copy of the
MojoCore struct, and may inadvertently be left with one which is actually
invalid -- i.e., |size| is bigger than its actual size.)

[DaveMoore, 2014/04/09 22:49:08]

Done.

+    return MOJO_RESULT_INVALID_ARGUMENT;
+  }
+  g_core = *mojo_core;
+  return MOJO_RESULT_OK;
 }
 
-// static
-Core* Core::Get() {
-  return g_core;
-}
-
-// static
-void Core::Reset() {
-  g_core = NULL;
-}
-
-}  // namespace mojo
+}  // extern "C"