Enable mmap and identity-based validation caching on pnacl-{llc,ld}.nexe

ppapi/native_client/src/trusted/plugin/plugin.cc

Index: ppapi/native_client/src/trusted/plugin/plugin.cc
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index 902e050c69e5a831c1cbd4cbe2b00857a888bf18..5d8d149243a456b163295b03c0496c13e6f74f81 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -41,12 +41,6 @@ const int64_t kTimeSmallMin = 1;         // in ms
 const int64_t kTimeSmallMax = 20000;     // in ms
 const uint32_t kTimeSmallBuckets = 100;
 
-const PP_NaClFileInfo kInvalidNaClFileInfo = {
-  PP_kInvalidFileHandle,
-  0,  // token_lo
-  0,  // token_hi
-};
-
 }  // namespace
 
 void Plugin::ShutDownSubprocesses() {
@@ -72,7 +66,7 @@ void Plugin::HistogramTimeSmall(const std::string& name,
                                       kTimeSmallBuckets);
 }
 
-bool Plugin::LoadHelperNaClModule(PP_FileHandle file_handle,
+bool Plugin::LoadHelperNaClModule(PP_NaClFileInfo file_info,
                                   NaClSubprocess* subprocess,
                                   const SelLdrStartParams& params) {
   CHECK(!pp::Module::Get()->core()->IsMainThread());
@@ -107,11 +101,6 @@ bool Plugin::LoadHelperNaClModule(PP_FileHandle file_handle,
   if (!service_runtime_started)
     return false;
 
-  PP_NaClFileInfo info;
-  info.handle = file_handle;
-  info.token_lo = 0;
-  info.token_hi = 0;
-
   // Now actually load the nexe, which can happen on a background thread.
   //
   // We can't use pp::BlockUntilComplete() inside an in-process plugin, so we
@@ -122,7 +111,7 @@ bool Plugin::LoadHelperNaClModule(PP_FileHandle file_handle,
       callback_factory_.NewCallback(
           &Plugin::LoadNexeAndStart,
           service_runtime,
-          info));
+          file_info));
   return service_runtime->WaitForNexeStart();
 }
 
@@ -238,7 +227,7 @@ bool Plugin::LoadNaClModuleContinuationIntern() {
 }
 
 NaClSubprocess* Plugin::LoadHelperNaClModule(const nacl::string& helper_url,
-                                             PP_FileHandle file_handle,
+                                             PP_NaClFileInfo file_info,
                                              ErrorInfo* error_info) {
   nacl::scoped_ptr<NaClSubprocess> nacl_subprocess(
       new NaClSubprocess("helper module", NULL, NULL));
@@ -254,12 +243,14 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(const nacl::string& helper_url,
   // done to save on address space and swap space.
   //
   // Currently, this works only in SFI-mode. So, LoadModule SRPC is still used.
-  // So, pass kInvalidNaClFileInfo here, and instead |file_handle| is passed
+  // So, pass kInvalidNaClFileInfo here, and instead |file_info| is passed
   // to LoadNaClModuleFromBackgroundThread() below.
-  // TODO(teravest, hidehiko): Pass file_handle to params, so that LaunchSelLdr
+  // TODO(teravest, hidehiko): Pass file_info to params, so that LaunchSelLdr
   // will look at the info.
+  PP_NaClFileInfo file_info_for_srpc = file_info;
+  PP_NaClFileInfo file_info_for_ipc = kInvalidNaClFileInfo;

[teravest, 2014/06/26 21:19:24]

I don't think you need to introduce file_info_for_ipc here.
The current code always uses kInvalidNaClFileInfo since this code path isn't
used for Non-SFI.

I have a change to move all this nexe loading to happen over IPC instead of
SRPC; just have to wrap up a failure that's happening on windows.

[jvoung (off chromium), 2014/06/26 22:48:39]

Okay, will leave this as it was.

   SelLdrStartParams params(helper_url,
-                           kInvalidNaClFileInfo,
+                           file_info_for_ipc,
                            false /* uses_irt */,
                            false /* uses_ppapi */,
                            false /* enable_dyncode_syscalls */,
@@ -268,7 +259,9 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(const nacl::string& helper_url,
 
   // Helper NaCl modules always use the PNaCl manifest, as there is no
   // corresponding NMF.
-  if (!LoadHelperNaClModule(file_handle, nacl_subprocess.get(), params)) {
+  if (!LoadHelperNaClModule(file_info_for_srpc,
+                            nacl_subprocess.get(),
+                            params)) {
     return NULL;
   }
   // We need not wait for the init_done callback.  We can block
@@ -330,9 +323,7 @@ Plugin::Plugin(PP_Instance pp_instance)
   // We call set_exit_status() here to ensure that the 'exitStatus' property is
   // set. This can only be called when nacl_interface_ is not NULL.
   set_exit_status(-1);
-  nexe_file_info_.handle = PP_kInvalidFileHandle;
-  nexe_file_info_.token_lo = 0;
-  nexe_file_info_.token_hi = 0;
+  nexe_file_info_ = kInvalidNaClFileInfo;
 }