Get all the resources relative to a single base. Currently the same base

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

 // Copyright (c) 2011 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 "native_client/src/trusted/plugin/pnacl_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
@@ skipping 330 matching lines @@
 // Helper functions for loading native libs.
 // Done here to avoid hacking on the manifest parser further...
 
 namespace {
 
 // Fake filename for the object file generated by llvm.
 nacl::string GeneratedObjectFileName() {
   return nacl::string("___PNACL_GENERATED");
 }
 
-string_vector LinkResources(const nacl::string& sandbox_isa,
-                            bool withGenerated) {
+nacl::string ResourceBaseUrl() {
+  nacl::string sandbox_isa = GetSandboxISA();
+  nacl::string base_url = "pnacl_support/" + sandbox_isa + "/";
+  return base_url;
+}
+
+string_vector LinkResources(bool withGenerated) {
   string_vector results;
-  nacl::string base_dir = "pnacl_support/" + sandbox_isa;
-
   // NOTE: order of items == link order.
-  results.push_back(base_dir + "/crtbegin.o");
+  results.push_back("crtbegin.o");
   if (withGenerated) {
     results.push_back(GeneratedObjectFileName());
   }
-  results.push_back(base_dir + "/libcrt_platform.a");
-  results.push_back(base_dir + "/libgcc.a");
-  results.push_back(base_dir + "/libgcc_eh.a");
-  results.push_back(base_dir + "/crtend.o");
+  results.push_back("libcrt_platform.a");
+  results.push_back("libgcc.a");
+  results.push_back("libgcc_eh.a");
+  results.push_back("crtend.o");
   return results;
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////
 // Final link callbacks.
 
 namespace {
 
@@ skipping 47 matching lines @@
                                         "C",
                                         &dummy_params,
                                         flag.c_str())) {
       AbortLinkThread(p,
                       "PnaclCoordinator linker AddArg(" + flag +
                       ") failed.");
     }
   }
 
   //// Files.
-  string_vector files = LinkResources(sandbox_isa, true);
+  string_vector files = LinkResources(true);
   PnaclResources* resources = coordinator->resources();
   for (string_vector::iterator i = files.begin(), e = files.end();
        i != e; ++i) {
     const nacl::string& link_file = *i;
     if (coordinator->SubprocessesShouldDie()) {
       NaClThreadExit(1);
     }
     // Add as argument.
     SrpcParams dummy_params;
     if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
@@ skipping 135 matching lines @@
     error_info.SetReport(ERROR_UNKNOWN,
                          "PnaclCoordinator: Failed to download file: " +
                          pexe_url + "\n");
     ReportLoadError(error_info);
     PnaclNonPpapiError();
   }
 }
 
 void PnaclCoordinator::BitcodeToNative(
     const nacl::string& pexe_url,
-    const nacl::string& llc_url,
-    const nacl::string& ld_url,
     const pp::CompletionCallback& finish_callback) {
-  PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (pexe=%s, llc=%s, ld=%s)\n",
-                 pexe_url.c_str(),
-                 llc_url.c_str(),
-                 ld_url.c_str()));
-  llc_url_ = llc_url;
-  ld_url_ = ld_url;
+  PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (pexe=%s)\n",
+                 pexe_url.c_str()));
+  // The base URL for finding all the resources will be obtained from the
+  // PNaCl manifest file.
+  // Also, the llc and ld pathnames should be read from the manifest.
+  // TODO(sehr): change to use the manifest file when ready.
+  resource_base_url_ = ResourceBaseUrl();
+  llc_url_ = "llc";
+  ld_url_ = "ld";
   translate_notify_callback_ = finish_callback;
 
   // Steps:
   // (1) Schedule downloads for llc, ld nexes, and native libraries (resources).
   // (2) When resources have been downloaded, download pexe.
   // (3) When pexe download has completed, start translation.
   // (4) When llc translation has finished do the link.
   // (5) When the link is done, we are done, call the finish_callback.
   // Hand off the SHM file descriptor returned by link.
 
   // Set up async callbacks for these steps in reverse order.
 
   translation_unit_.reset(new PnaclTranslationUnit(this));
 
   // When resources loading completes, this causes the pexe download.
   pp::CompletionCallback resources_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourcesDidLoad,
                                     pexe_url,
                                     translation_unit_.get());
-  resources_->AddResourceUrl(llc_url);
-  resources_->AddResourceUrl(ld_url);
-  string_vector link_resources = LinkResources(GetSandboxISA(), false);
+  resources_->AddResourceUrl(llc_url_);
+  resources_->AddResourceUrl(ld_url_);
+  string_vector link_resources = LinkResources(false);
   for (string_vector::iterator
            i = link_resources.begin(), e = link_resources.end();
        i != e;
        ++i) {
     resources_->AddResourceUrl(*i);
   }
   resources_->RunWhenAllLoaded(resources_cb);
   resources_->StartDownloads();
 }
 
 }  // namespace plugin