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

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "native_client/src/include/nacl_base.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/include/portability_string.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 "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/cpp/dev/url_util_dev.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/text_input_controller.h"
@@ skipping 558 matching lines @@
       pp_error,
       info.get_desc(),
       nexe_downloader_.status_code(),
       nexe_bytes_read,
       nexe_downloader_.url().c_str(),
       nexe_downloader_.TimeSinceOpenMilliseconds());
 
   if (nexe_bytes_read == -1)
     return;
 
+  // Handing desc ownership to the wrapper.
+  // However, we still need the tokens so keep that in the tmp_info.
+  tmp_info = info.Release();
   nacl::scoped_ptr<nacl::DescWrapper>
-      wrapper(wrapper_factory()->MakeFileDesc(info.Release().desc, O_RDONLY));
-  NaClLog(4, "NexeFileDidOpen: invoking LoadNaClModule\n");
+      wrapper(wrapper_factory()->MakeFileDesc(tmp_info.desc, O_RDONLY));
+  tmp_info.desc = -1;
+  if (tmp_info.file_token.lo != 0 && tmp_info.file_token.hi != 0) {
+    if (!NaClDescSetFileToken(wrapper->desc(), &tmp_info.file_token)) {
+      PLUGIN_PRINTF((
+          "NexeFileDidOpen: NaClDescSetFileToken failed\n"));
+    } else {
+      PLUGIN_PRINTF((
+          "NexeFileDidOpen: NaClDescSetFileToken success\n"));
+    }
+  } else {
+    PLUGIN_PRINTF(("NexeFileDidOpen: No file tokens for NaCl main nexe\n"));
+  }
+  PLUGIN_PRINTF(("NexeFileDidOpen: invoking LoadNaClModule\n"));
   LoadNaClModule(
       wrapper.release(),
       uses_nonsfi_mode_,
       true, /* enable_dyncode_syscalls */
       true, /* enable_exception_handling */
       false, /* enable_crash_throttling */
       callback_factory_.NewCallback(&Plugin::NexeFileDidOpenContinuation),
       callback_factory_.NewCallback(&Plugin::NexeDidCrash));
 }
 
@@ skipping 540 matching lines @@
 
 void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
                                        int exit_status) {
   DCHECK(pp::Module::Get()->core()->IsMainThread());
   DCHECK(nacl_interface_);
   nacl_interface_->SetExitStatus(pp_instance(), exit_status);
 }
 
 
 }  // namespace plugin