Parametrize names of llc and ld nexes by reading them from the resource info JSON file.

ppapi/native_client/src/trusted/plugin/pnacl_resources.h

 // 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.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 
 #include <map>
 #include <vector>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/nexe_arch.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/cpp/completion_callback.h"
 
 namespace plugin {
 
 class Manifest;
 class Plugin;
 class PnaclCoordinator;
 
 // Constants for loading LLC and LD.
 class PnaclUrls {
  public:
+  // Get the base URL prefix for Pnacl resources (without platform prefix).
   static nacl::string GetBaseUrl();
+
+  // Return {platform_prefix}/url
+  static nacl::string PrependPlatformPrefix(const nacl::string& url);
+
   static bool IsPnaclComponent(const nacl::string& full_url);
   static nacl::string PnaclComponentURLToFilename(
       const nacl::string& full_url);
-  static const nacl::string GetLlcUrl() { return nacl::string(kLlcUrl); }
-  static const nacl::string GetLdUrl() { return nacl::string(kLdUrl); }
+  static const nacl::string GetResourceInfoUrl() {

[jvoung (off chromium), 2013/05/23 20:33:19]

Document the resource info also.

[eliben, 2013/05/23 20:54:25]

Done.

+    return nacl::string(kResourceInfoUrl);
+  }
  private:
-  static const char kLlcUrl[];
-  static const char kLdUrl[];
+  static const char kResourceInfoUrl[];
 };
 
 // Loads a list of resources, providing a way to get file descriptors for
 // these resources.  URLs for resources are resolved by the manifest
 // and point to pnacl component filesystem resources.
 class PnaclResources {
  public:
   PnaclResources(Plugin* plugin,
                  PnaclCoordinator* coordinator,
-                 const Manifest* manifest,
-                 const std::vector<nacl::string>& resource_urls,
-                 const pp::CompletionCallback& all_loaded_callback)
+                 const Manifest* manifest)
       : plugin_(plugin),
         coordinator_(coordinator),
         manifest_(manifest),
-        resource_urls_(resource_urls),
-        all_loaded_callback_(all_loaded_callback) {
+        llc_tool_name(kDefaultLlcName),
+        ld_tool_name(kDefaultLdName) {
   }
   virtual ~PnaclResources();
 
-  // Start loading the resources.  After construction, this is the first step.
-  virtual void StartLoad();
-  // Get file descs by name. Only valid after all_loaded_callback_ has been run.
+  // Read the resource info JSON file.  This is the first step after
+  // construction; it has to be completed before StartLoad is called.
+  virtual void ReadResourceInfo(
+      const nacl::string& resource_info_url,
+      const pp::CompletionCallback& resource_info_read_cb);
+
+  // Start loading the resources.
+  virtual void StartLoad(
+      const pp::CompletionCallback& all_loaded_callback);
+
+  const nacl::string& GetLlcUrl() {
+    return llc_tool_name;
+  }
+
+  const nacl::string& GetLdUrl() {
+    return ld_tool_name;
+  }
+
+  // Get file descs by name. Only valid after StartLoad's completion callback
+  // fired.
   nacl::DescWrapper* WrapperForUrl(const nacl::string& url);
 
   static int32_t GetPnaclFD(Plugin* plugin, const char* filename);
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources);
 
   // The plugin requesting the resource loading.
   Plugin* plugin_;
   // The coordinator responsible for reporting errors, etc.
   PnaclCoordinator* coordinator_;
   // The manifest for looking up resource URLs.
   const Manifest* manifest_;
-  // The list of resource URLs (relative to resource_base_url_) to load.
-  std::vector<nacl::string> resource_urls_;
-  // Callback to be invoked when all resources can be guaranteed available.
-  pp::CompletionCallback all_loaded_callback_;
   // The descriptor wrappers for the downloaded URLs.  Only valid
   // once all_loaded_callback_ has been invoked.
   std::map<nacl::string, nacl::DescWrapper*> resource_wrappers_;
+
+  // The names of the llc and ld nexes are read from the resource info file.
+  // These are default values if the resource file does not contain the names.
+  // TODO(eliben): this should be eventually removed, once all nacl deps
+  // propagate - the names should always exist in the resource info JSON file.
+  static const char kDefaultLlcName[];
+  static const char kDefaultLdName[];
+
+  // Tool names for llc and ld; read from the resource info file.
+  nacl::string llc_tool_name;
+  nacl::string ld_tool_name;
+
+  // Parses resource info json data in buf.  Returns true if successful.

[jvoung (off chromium), 2013/05/23 20:33:19]

Could put pipes around argument names like |buf| and |errmsg|

[eliben, 2013/05/23 20:54:25]

Done.

+  // Otherwise returns false and places an error message in errmsg.
+  bool ParseResourceInfo(const nacl::string& buf, nacl::string& errmsg);
+
+  // Convenience function for reporting an error while reading the resource
+  // info file.
+  void ReadResourceInfoError(const nacl::string& msg);
 };
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_