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

ppapi/native_client/src/trusted/plugin/pnacl_resources.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_resources.h"
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
+#include "native_client/src/trusted/desc_cacheability/desc_cacheability.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/native_client/src/trusted/plugin/file_utils.h"
 #include "ppapi/native_client/src/trusted/plugin/manifest.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 #include "third_party/jsoncpp/source/include/json/reader.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 
 namespace plugin {
@@ skipping 37 matching lines @@
   for (std::map<nacl::string, nacl::DescWrapper*>::iterator
            i = resource_wrappers_.begin(), e = resource_wrappers_.end();
        i != e;
        ++i) {
     delete i->second;
   }
   resource_wrappers_.clear();
 }
 
 // static
-int32_t PnaclResources::GetPnaclFD(Plugin* plugin, const char* filename) {
+int32_t PnaclResources::GetPnaclFD(Plugin* plugin,
+                                   const char* filename,
+                                   bool is_executable,
+                                   uint64_t* file_token_lo,
+                                   uint64_t* file_token_hi) {
   PP_FileHandle file_handle =
-      plugin->nacl_interface()->GetReadonlyPnaclFd(filename);
+      plugin->nacl_interface()->GetReadonlyPnaclFd(
+          filename, PP_FromBool(is_executable), file_token_lo, file_token_hi);
   if (file_handle == PP_kInvalidFileHandle)
     return -1;
 
-#if NACL_WINDOWS
-  //////// Now try the posix view.
-  int32_t posix_desc = _open_osfhandle(reinterpret_cast<intptr_t>(file_handle),
-                                       _O_RDONLY | _O_BINARY);
-  if (posix_desc == -1) {
-    PLUGIN_PRINTF((
-        "PnaclResources::GetPnaclFD failed to convert HANDLE to posix\n"));
-    // Close the Windows HANDLE if it can't be converted.
-    CloseHandle(file_handle);
-  }
-  return posix_desc;
-#else
-  return file_handle;
-#endif
+  int32_t posix_desc = file_utils::ConvertFileDescriptor(file_handle);
+  return posix_desc; // Also need file info!
 }
 
 nacl::DescWrapper* PnaclResources::WrapperForUrl(const nacl::string& url) {
   CHECK(resource_wrappers_.find(url) != resource_wrappers_.end());
   return resource_wrappers_[url];
 }
 
 void PnaclResources::ReadResourceInfo(
     const nacl::string& resource_info_url,
     const pp::CompletionCallback& resource_info_read_cb) {
   PLUGIN_PRINTF(("PnaclResources::ReadResourceInfo\n"));
 
   nacl::string full_url = PnaclUrls::GetBaseUrl() + resource_info_url;
   PLUGIN_PRINTF(("Resolved resources info url: %s\n", full_url.c_str()));
   nacl::string resource_info_filename =
     PnaclUrls::PnaclComponentURLToFilename(full_url);
 
   PLUGIN_PRINTF(("Pnacl-converted resources info url: %s\n",
                  resource_info_filename.c_str()));
 
-  int32_t fd = GetPnaclFD(plugin_, resource_info_filename.c_str());
+  uint64_t file_token_lo;
+  uint64_t file_token_hi;
+  int32_t fd = GetPnaclFD(plugin_, resource_info_filename.c_str(), false,
+                          &file_token_lo, &file_token_hi);
   if (fd < 0) {
     // File-open failed. Assume this means that the file is
     // not actually installed.
     ReadResourceInfoError(
         nacl::string("The Portable Native Client (pnacl) component is not "
                      "installed. Please consult chrome://components for more "
                      "information."));
     return;
   }
 
@@ skipping 82 matching lines @@
     nacl::string full_url = GetFullUrl(
         resource_urls[i], plugin_->nacl_interface()->GetSandboxArch());
     if (full_url == "") {
       coordinator_->ReportNonPpapiError(
           PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
           nacl::string("failed to resolve ") + resource_urls[i] + ".");
       break;
     }
     nacl::string filename = PnaclUrls::PnaclComponentURLToFilename(full_url);
 
-    int32_t fd = PnaclResources::GetPnaclFD(plugin_, filename.c_str());
-    if (fd < 0) {
+    NaClFileInfo tmp_info;
+    tmp_info.desc = PnaclResources::GetPnaclFD(plugin_, filename.c_str(), true,
+                                               &tmp_info.file_token.lo,
+                                               &tmp_info.file_token.hi);
+    if (tmp_info.desc < 0) {
       // File-open failed. Assume this means that the file is
       // not actually installed. This shouldn't actually occur since
       // ReadResourceInfo() should happen first, and error out.
       coordinator_->ReportNonPpapiError(
           PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
         nacl::string("The Portable Native Client (pnacl) component is not "
                      "installed. Please consult chrome://components for more "
                      "information."));
       result = PP_ERROR_FILENOTFOUND;
       break;
     } else {
       resource_wrappers_[resource_urls[i]] =
-          plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);
+          plugin_->wrapper_factory()->MakeFileDesc(tmp_info.desc, O_RDONLY);
+      if (tmp_info.file_token.lo != 0 && tmp_info.file_token.hi != 0) {
+        if (!NaClDescSetFileToken(resource_wrappers_[resource_urls[i]]->desc(),
+                                  &tmp_info.file_token)) {
+          PLUGIN_PRINTF((
+              "PnaclResources::StartLoad: NaClDescSetFileToken failed\n"));
+        } else {
+          PLUGIN_PRINTF((
+              "PnaclResources::StartLoad: NaClDescSetFileToken success\n"));
+        }
+      } else {
+        PLUGIN_PRINTF((
+            "PnaclResources::StartLoad: no file token\n"));
+      }
     }
   }
   // We're done!  Queue the callback.
   pp::Core* core = pp::Module::Get()->core();
   core->CallOnMainThread(0, all_loaded_callback, result);
 }
 
 }  // namespace plugin