Pepper: Move manifest logic to components/nacl.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.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_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_uma_private.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/plugin_error.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h"
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 #include "ppapi/native_client/src/trusted/plugin/temporary_file.h"
 
 namespace plugin {
 
 //////////////////////////////////////////////////////////////////////
-//  Pnacl-specific manifest support.
-//////////////////////////////////////////////////////////////////////
-
-// The PNaCl linker gets file descriptors via the service runtime's
-// reverse service lookup.  The reverse service lookup requires a manifest.
-// Normally, that manifest is an NMF containing mappings for shared libraries.
-// Here, we provide a manifest that redirects to PNaCl component files
-// that are part of Chrome.
-class PnaclManifest : public Manifest {
- public:
-  PnaclManifest(const nacl::string& sandbox_arch)
-      : sandbox_arch_(sandbox_arch) { }
-
-  virtual ~PnaclManifest() { }
-
-  virtual bool GetProgramURL(nacl::string* full_url,
-                             PP_PNaClOptions* pnacl_options,
-                             bool* uses_nonsfi_mode,
-                             ErrorInfo* error_info) const {
-    // Does not contain program urls.
-    UNREFERENCED_PARAMETER(full_url);
-    UNREFERENCED_PARAMETER(pnacl_options);
-    UNREFERENCED_PARAMETER(uses_nonsfi_mode);
-    UNREFERENCED_PARAMETER(error_info);
-    PLUGIN_PRINTF(("PnaclManifest does not contain a program\n"));
-    error_info->SetReport(PP_NACL_ERROR_MANIFEST_GET_NEXE_URL,
-                          "pnacl manifest does not contain a program.");
-    return false;
-  }
-
-  virtual bool ResolveKey(const nacl::string& key,
-                          nacl::string* full_url,
-                          PP_PNaClOptions* pnacl_options) const {
-    // All of the component files are native (do not require pnacl translate).
-    pnacl_options->translate = PP_FALSE;
-    // We can only resolve keys in the files/ namespace.
-    const nacl::string kFilesPrefix = "files/";
-    size_t files_prefix_pos = key.find(kFilesPrefix);
-    if (files_prefix_pos == nacl::string::npos) {
-      PLUGIN_PRINTF(("key did not start with files/"));
-      return false;
-    }
-    // Resolve the full URL to the file. Provide it with a platform-specific
-    // prefix.
-    nacl::string key_basename = key.substr(kFilesPrefix.length());
-    *full_url = PnaclUrls::GetBaseUrl() + sandbox_arch_ + "/" + key_basename;
-    return true;
-  }
-
- private:
-  NACL_DISALLOW_COPY_AND_ASSIGN(PnaclManifest);
-
-  nacl::string sandbox_arch_;
-};
-
-//////////////////////////////////////////////////////////////////////
 //  UMA stat helpers.
 //////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // Assume translation time metrics *can be* large.
 // Up to 12 minutes.
 const int64_t kTimeLargeMin = 10;          // in ms
 const int64_t kTimeLargeMax = 720000;      // in ms
 const uint32_t kTimeLargeBuckets = 100;
@@ skipping 79 matching lines @@
     const nacl::string& pexe_url,
     const PP_PNaClOptions& pnacl_options,
     const pp::CompletionCallback& translate_notify_callback) {
   PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (plugin=%p, pexe=%s)\n",
                  static_cast<void*>(plugin), pexe_url.c_str()));
   PnaclCoordinator* coordinator =
       new PnaclCoordinator(plugin, pexe_url,
                            pnacl_options,
                            translate_notify_callback);
   coordinator->pnacl_init_time_ = NaClGetTimeOfDayMicroseconds();
-  PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (manifest=%p, ",
-                 reinterpret_cast<const void*>(coordinator->manifest_.get())));
-

[bbudge, 2014/05/01 23:32:33]

Is there a way to keep this output, perhaps from another place?

[teravest, 2014/05/02 14:23:15]

I've restored this line and print the manifest_id_ now.

   int cpus = plugin->nacl_interface()->GetNumberOfProcessors();
   coordinator->split_module_count_ = std::min(4, std::max(1, cpus));
 
   // First start a network request for the pexe, to tickle the component
   // updater's On-Demand resource throttler, and to get Last-Modified/ETag
   // cache information. We can cancel the request later if there's
   // a bitcode->nexe cache hit.
   coordinator->OpenBitcodeStream();
   return coordinator;
 }
 
 PnaclCoordinator::PnaclCoordinator(
     Plugin* plugin,
     const nacl::string& pexe_url,
     const PP_PNaClOptions& pnacl_options,
     const pp::CompletionCallback& translate_notify_callback)
   : translate_finish_error_(PP_OK),
     plugin_(plugin),
     translate_notify_callback_(translate_notify_callback),
     translation_finished_reported_(false),
-    manifest_(new PnaclManifest(plugin->nacl_interface()->GetSandboxArch())),
+    manifest_id_(
+        GetNaClInterface()->CreatePnaclManifest(plugin->pp_instance())),
     pexe_url_(pexe_url),
     pnacl_options_(pnacl_options),
     split_module_count_(1),
     num_object_files_opened_(0),
     is_cache_hit_(PP_FALSE),
     error_already_reported_(false),
     pnacl_init_time_(0),
     pexe_size_(0),
     pexe_bytes_compiled_(0),
     expected_pexe_size_(-1) {
@@ skipping 443 matching lines @@
 void PnaclCoordinator::RunTranslate(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::RunTranslate (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   // Invoke llc followed by ld off the main thread.  This allows use of
   // blocking RPCs that would otherwise block the JavaScript main thread.
   pp::CompletionCallback report_translate_finished =
       callback_factory_.NewCallback(&PnaclCoordinator::TranslateFinished);
 
   CHECK(translate_thread_ != NULL);
   translate_thread_->RunTranslate(report_translate_finished,
-                                  manifest_.get(),
+                                  manifest_id_,
                                   &obj_files_,
                                   temp_nexe_file_.get(),
                                   invalid_desc_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin