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

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

 // Copyright (c) 2012 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.
 
 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h"
 
 #include <iterator>
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "ppapi/cpp/var.h"
@@ skipping 144 matching lines @@
   SrpcParams params;
   std::vector<nacl::DescWrapper*> llc_out_files;
   size_t i;
   for (i = 0; i < obj_files_->size(); i++)
     llc_out_files.push_back((*obj_files_)[i]->write_wrapper());
   for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     llc_out_files.push_back(invalid_desc_wrapper_);
 
   pp::Core* core = pp::Module::Get()->core();
   int64_t llc_start_time = NaClGetTimeOfDayMicroseconds();
-  PP_FileHandle llc_file_handle = resources_->TakeLlcFileHandle();
-  // On success, ownership of llc_file_handle is transferred.
+  PP_NaClFileInfo llc_file_info = resources_->TakeLlcFileInfo();
+  // On success, ownership of llc_file_info is transferred.
   NaClSubprocess* llc_subprocess = plugin_->LoadHelperNaClModule(
-      resources_->GetLlcUrl(), llc_file_handle, &error_info);
+      resources_->GetLlcUrl(), llc_file_info, &error_info);
   if (llc_subprocess == NULL) {
-    if (llc_file_handle != PP_kInvalidFileHandle)
-      CloseFileHandle(llc_file_handle);
+    if (llc_file_info.handle != PP_kInvalidFileHandle)
+      CloseFileHandle(llc_file_info.handle);
     TranslateFailed(PP_NACL_ERROR_PNACL_LLC_SETUP,
                     "Compile process could not be created: " +
                     error_info.message());
     return;
   }
   GetNaClInterface()->LogTranslateTime(
       "NaCl.Perf.PNaClLoadTime.LoadCompiler",
       NaClGetTimeOfDayMicroseconds() - llc_start_time);
 
   {
@@ skipping 145 matching lines @@
                       "Link process could not reset object file");
       return false;
     }
     ld_in_files.push_back((*obj_files_)[i]->read_wrapper());
   }
   for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     ld_in_files.push_back(invalid_desc_wrapper_);
 
   nacl::DescWrapper* ld_out_file = nexe_file_->write_wrapper();
   int64_t ld_start_time = NaClGetTimeOfDayMicroseconds();
-  PP_FileHandle ld_file_handle = resources_->TakeLdFileHandle();
-  // On success, ownership of ld_file_handle is transferred.
+  PP_NaClFileInfo ld_file_info = resources_->TakeLdFileInfo();
+  // On success, ownership of ld_file_info is transferred.
   nacl::scoped_ptr<NaClSubprocess> ld_subprocess(
       plugin_->LoadHelperNaClModule(resources_->GetLlcUrl(),
-                                    ld_file_handle,
+                                    ld_file_info,
                                     &error_info));
   if (ld_subprocess.get() == NULL) {
-    if (ld_file_handle != PP_kInvalidFileHandle)
-      CloseFileHandle(ld_file_handle);
+    if (ld_file_info.handle != PP_kInvalidFileHandle)
+      CloseFileHandle(ld_file_info.handle);
     TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
                     "Link process could not be created: " +
                     error_info.message());
     return false;
   }
   GetNaClInterface()->LogTranslateTime(
       "NaCl.Perf.PNaClLoadTime.LoadLinker",
       NaClGetTimeOfDayMicroseconds() - ld_start_time);
   {
     nacl::MutexLocker ml(&subprocess_mu_);
@@ skipping 91 matching lines @@
   AbortSubprocesses();
   if (translate_thread_ != NULL)
     NaClThreadJoin(translate_thread_.get());
   PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
   NaClCondVarDtor(&buffer_cond_);
   NaClMutexDtor(&cond_mu_);
   NaClMutexDtor(&subprocess_mu_);
 }
 
 } // namespace plugin