Allow PNaCl NMF to set translator optimization options for experimentation.

ppapi/native_client/src/trusted/plugin/service_runtime.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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime"
 
 #include "native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 241 matching lines @@
 void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(
     OpenManifestEntryResource* p,
     int32_t err) {
   OpenManifestEntryResource *open_cont;
   UNREFERENCED_PARAMETER(err);
   // CallOnMainThread continuations always called with err == PP_OK.
 
   NaClLog(4, "Entered OpenManifestEntry_MainThreadContinuation\n");
 
   std::string mapped_url;
-  std::string cache_identity;
-  if (!manifest_->ResolveKey(p->url, &mapped_url, &cache_identity,
-                             p->error_info, &p->pnacl_translate)) {
+  PnaclOptions pnacl_options;
+  if (!manifest_->ResolveKey(p->url, &mapped_url,
+                             &pnacl_options, p->error_info)) {
     NaClLog(4, "OpenManifestEntry_MainThreadContinuation: ResolveKey failed\n");
     // Failed, and error_info has the details on what happened.  Wake
     // up requesting thread -- we are done.
     nacl::MutexLocker take(&mu_);
     *p->op_complete_ptr = true;  // done...
     *p->out_desc = -1;       // but failed.
     NaClXCondVarBroadcast(&cv_);
     return;
   }
   NaClLog(4,
           "OpenManifestEntry_MainThreadContinuation: "
           "ResolveKey: %s -> %s (pnacl_translate(%d))\n",
-          p->url.c_str(), mapped_url.c_str(), p->pnacl_translate);
+          p->url.c_str(), mapped_url.c_str(), pnacl_options.translate());
 
   open_cont = new OpenManifestEntryResource(*p);  // copy ctor!
   CHECK(open_cont != NULL);
   open_cont->url = mapped_url;
-  if (!open_cont->pnacl_translate) {
+  if (!pnacl_options.translate()) {
     pp::CompletionCallback stream_cc = WeakRefNewCallback(
         anchor_,
         this,
         &PluginReverseInterface::StreamAsFile_MainThreadContinuation,
         open_cont);
-    //
+    // Normal files.
     if (!PnaclUrls::IsPnaclComponent(mapped_url)) {
       if (!plugin_->StreamAsFile(mapped_url,
                                  stream_cc.pp_completion_callback())) {
         NaClLog(4,
                 "OpenManifestEntry_MainThreadContinuation: "
                 "StreamAsFile failed\n");
         nacl::MutexLocker take(&mu_);
         *p->op_complete_ptr = true;  // done...
         *p->out_desc = -1;       // but failed.
         p->error_info->SetReport(ERROR_MANIFEST_OPEN,
                                  "ServiceRuntime: StreamAsFile failed");
         NaClXCondVarBroadcast(&cv_);
         return;
       }
       NaClLog(4,
               "OpenManifestEntry_MainThreadContinuation: StreamAsFile okay\n");
     } else {
+      // Special PNaCl support files, that are installed on the
+      // user machine.
       int32_t fd = PnaclResources::GetPnaclFD(
           plugin_,
           PnaclUrls::PnaclComponentURLToFilename(mapped_url).c_str());
       if (fd < 0) {
         // We should check earlier if the pnacl component wasn't installed
         // yet.  At this point, we can't do much anymore, so just continue
         // with an invalid fd.
         NaClLog(4,
                 "OpenManifestEntry_MainThreadContinuation: "
                 "GetReadonlyPnaclFd failed\n");
         // TODO(jvoung): Separate the error codes?
         p->error_info->SetReport(ERROR_MANIFEST_OPEN,
                                  "ServiceRuntime: GetPnaclFd failed");
       }
       nacl::MutexLocker take(&mu_);
       *p->op_complete_ptr = true;  // done!
       *p->out_desc = fd;
       NaClXCondVarBroadcast(&cv_);
       NaClLog(4,
               "OpenManifestEntry_MainThreadContinuation: GetPnaclFd okay\n");
     }
   } else {
+    // Requires PNaCl translation.
     NaClLog(4,
             "OpenManifestEntry_MainThreadContinuation: "
             "pulling down and translating.\n");
     if (plugin_->nacl_interface()->IsPnaclEnabled()) {
       pp::CompletionCallback translate_callback =
           WeakRefNewCallback(
               anchor_,
               this,
               &PluginReverseInterface::BitcodeTranslate_MainThreadContinuation,
               open_cont);
       // Will always call the callback on success or failure.
       pnacl_coordinator_.reset(
           PnaclCoordinator::BitcodeToNative(plugin_,
                                             mapped_url,
-                                            cache_identity,
+                                            pnacl_options,
                                             translate_callback));
     } else {
       nacl::MutexLocker take(&mu_);
       *p->op_complete_ptr = true;  // done...
       *p->out_desc = -1;       // but failed.
       p->error_info->SetReport(ERROR_PNACL_NOT_ENABLED,
                                "ServiceRuntime: GetPnaclFd failed -- pnacl not "
                                "enabled with --enable-pnacl.");
       NaClXCondVarBroadcast(&cv_);
       return;
@@ skipping 488 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return "";
   }
 }
 
 }  // namespace plugin