NaCl: create a separate namespace for Mojo handles.

nacl_bindings_generator/mojo_syscall.cc.tmpl

 // Copyright 2014 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.
 
 {{generator_warning}}
 
 #include "{{bindings_dir}}/mojo_syscall.h"
 
 #include <stdio.h>
 
+#include "mojo/public/c/system/core.h"
+#include "mojo/public/platform/native/core_system_api.h"
 #include "{{bindings_dir}}/mojo_syscall_internal.h"
-#include "mojo/public/c/system/core.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
 
 MojoHandle g_mojo_handle = MOJO_HANDLE_INVALID;
+MojoCoreHandle g_mojo_core = nullptr;
 
 namespace {
 
 MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
   *handle = g_mojo_handle;
   return MOJO_RESULT_OK;
 }
 
 void MojoDescDestroy(void* handle) {
 }
@@ skipping 61 matching lines @@
   return NaClDescMakeCustomDesc(nap, &funcs);
 }
 
 } // namespace
 
 // The value for this FD must not conflict with uses inside Chromium. However,
 // mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define
 // from there.
 #define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 3)
 
-void InjectMojo(struct NaClApp* nap) {
-  NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeMojoDesc(nap));
-  g_mojo_handle = MOJO_HANDLE_INVALID;
-}
-
 void InjectMojo(struct NaClApp* nap, MojoHandle handle) {
   NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeMojoDesc(nap));
-  g_mojo_handle = handle;
+  g_mojo_core = MojoCoreCreateCore();
+  // TODO handle errors?

[viettrungluu, 2015/04/01 23:36:19]

nit: "TODO(ncbray):"

[Nick Bray (chromium), 2015/04/04 00:09:09]

Done.

+  MojoCoreTransferHandle(MojoCoreGetDefaultCore(), handle, g_mojo_core, &g_mojo_handle);

[viettrungluu, 2015/04/01 23:36:19]

80 cols

[Nick Bray (chromium), 2015/04/04 00:09:09]

Done.

 }
 
 void InjectDisabledMojo(struct NaClApp* nap) {
   NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeDisabledMojoDesc(nap));
 }