Extend IRT with nacl_irt_resource_open interface

src/shared/ppapi_proxy/plugin_globals.cc

 // Copyright (c) 2011 The Native Client Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/nacl_imc_api.h>
 #include <sys/nacl_syscalls.h>
 
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h"
@@ skipping 137 matching lines @@
 }
 
 
 }  // namespace ppapi_proxy
 
 void PpapiPluginRegisterThreadCreator(
     const struct PP_ThreadFunctions* new_funcs) {
   thread_funcs = *new_funcs;
 }
 
-int PpapiPluginMain() {
-  if (getenv("NACL_LD_ACCEPTS_PLUGIN_CONNECTION") != NULL) {
-    // Send a message to the page to ask it to reinitialise the
-    // plugin's SRPC/PPAPI connection.  This triggers a call to
-    // __startSrpcServices() which in turn calls
-    // StartProxiedExecution() which sets up the PPAPI proxy.  This is
-    // necessary because LoadNaClModule()'s earlier call to
-    // StartSrpcServices() was matched by the dynamic linker before
-    // libppruntime was available.
-    // For background, see:
-    // http://code.google.com/p/nativeclient/issues/detail?id=617
-    // http://code.google.com/p/nativeclient/issues/detail?id=1501
-    // TODO(mseaborn): This is a temporary measure.  Find a less hacky
-    // way to do this.
-    struct NaClImcMsgIoVec iov = { const_cast<char*>("Init"), 4 };
-    struct NaClImcMsgHdr message = { &iov, 1, NULL, 0, 0 };
-    imc_sendmsg(NACL_SEND_FD, &message, 0);
-  }
+// TODO(halyavin): this is needed for tests without IRT. They do not start
+// in irt_entry.c where PpapiPluginPreInit is called.

[Roland McGrath, 2011/08/16 17:32:50]

This comment refers to a function that does not exist.

Anyway, it's cleaner to move this inside IrtInit itself.

[halyavin, 2011/08/16 18:06:25]

Done.

+static int initialized = 0;
 
+int IrtInit() {
   if (!NaClSrpcModuleInit()) {
     return 1;
   }
   NaClLogModuleInit();  // Enable NaClLog'ing used by CHECK().
+  initialized = 1;
+  return 0;
+}
+
+int PpapiPluginMain() {
+  if (!initialized) {

[Roland McGrath, 2011/08/16 17:32:50]

This is not thread-safe, which could be a problem in some potential usage
patterns.  It's fine to leave that for the moment, but it needs a TODO comment.

[halyavin, 2011/08/16 18:06:25]

This will be changed, if we implement lazy initialization.

+    int status = IrtInit();
+    if (0 != status) {
+      return status;
+    }
+  }
   PpapiPluginRegisterDefaultThreadCreator();
   // Designate this as the main thread for PPB_Core::IsMainThread().
   ppapi_proxy::PluginCore::MarkMainThread();
   if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) {
     return 1;
   }
   NaClSrpcModuleFini();
 
   return 0;
 }