Plumb through cache_identity from manifest for first sketch of pnacl cache.

ppapi/native_client/src/trusted/plugin/json_manifest.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 <algorithm>
 
 #include "native_client/src/trusted/plugin/json_manifest.h"
 
@@ skipping 21 matching lines @@
 // ISA Dictionary keys
 const char* const kX8632Key =       "x86-32";
 const char* const kX8664Key =       "x86-64";
 const char* const kArmKey =         "arm";
 const char* const kPortableKey =    "portable";
 
 // Url Resolution keys
 const char* const kPnaclTranslateKey = "pnacl-translate";
 const char* const kUrlKey =            "url";
 
+// Cache support keys
+const char* const kCacheIdentityKey = "sha256";
+
 // Sample manifest file:
 // {
 //   "program": {
 //     "x86-32": {"url": "myprogram_x86-32.nexe"},
 //     "x86-64": {"url": "myprogram_x86-64.nexe"},
 //     "arm": {"url": "myprogram_arm.nexe"},
-//     "portable": {"pnacl-translate": {"url": "myprogram.pexe"} }
+//     "portable": {
+//       "pnacl-translate": {
+//         "url": "myprogram.pexe",
+//         "sha256": "..."
+//       }
+//     }
 //   },
 //   "interpreter": {
 //     "x86-32": {"url": "interpreter_x86-32.nexe"},
 //     "x86-64": {"url": "interpreter_x86-64.nexe"},
 //     "arm": {"url": "interpreter_arm.nexe"}
 //   },
 //   "files": {
 //     "foo.txt": {
 //       "portable": {"url": "foo.txt"}
 //     },
@@ skipping 71 matching lines @@
   return true;
 }
 
 // Validate a "url" dictionary assuming it was resolved from container_key.
 // E.g., "container_key" : { "url": "foo.txt" }
 bool IsValidUrlSpec(const Json::Value& url_spec,
                     const nacl::string& container_key,
                     const nacl::string& parent_key,
                     nacl::string* error_string) {
   static const char* kManifestUrlSpecProperties[] = {
-    kUrlKey
+    kUrlKey,
+    kCacheIdentityKey,
   };
   if (!IsValidDictionary(url_spec, container_key, parent_key,
                          kManifestUrlSpecProperties,
                          NACL_ARRAY_SIZE(kManifestUrlSpecProperties),
                          kManifestUrlSpecProperties,
                          NACL_ARRAY_SIZE(kManifestUrlSpecProperties),
                          error_string)) {
     return false;
   }
   Json::Value url = url_spec[kUrlKey];
@@ skipping 88 matching lines @@
 
   if (!has_isa && !has_portable) {
     *error_string = parent_key +
         " no version given for current arch and no portable version found.";
     return false;
   }
 
   return true;
 }
 
+bool GrabUrlAndCacheIdentity(const Json::Value& url_spec,
+                             nacl::string* url,
+                             nacl::string* cache_identity) {
+  *url = url_spec[kUrlKey].asString();
+  if (url_spec.isMember(kCacheIdentityKey)) {
+    *cache_identity = url_spec[kCacheIdentityKey].asString();
+  }
+}
+
 bool GetURLFromISADictionary(const Json::Value& dictionary,
                              const nacl::string& parent_key,
                              const nacl::string& sandbox_isa,
                              bool prefer_portable,
                              nacl::string* url,
+                             nacl::string* cache_identity,
                              nacl::string* error_string,
                              bool* pnacl_translate) {
-  if (url == NULL || error_string == NULL || pnacl_translate == NULL)
+  if (url == NULL || cache_identity == NULL ||
+      error_string == NULL || pnacl_translate == NULL)
     return false;
 
   if (!IsValidISADictionary(dictionary, parent_key, sandbox_isa, error_string))
     return false;
 
+  *url = "";
+  *cache_identity = "";
+  *pnacl_translate = false;
+
   // The call to IsValidISADictionary() above guarantees that either
   // sandbox_isa or kPortableKey is present in the dictionary.
   bool has_portable = dictionary.isMember(kPortableKey);
   bool has_isa = dictionary.isMember(sandbox_isa);
   nacl::string chosen_isa;
   if ((has_portable && prefer_portable) || !has_isa) {
     chosen_isa = kPortableKey;
   } else {
     chosen_isa = sandbox_isa;
   }
   const Json::Value& isa_spec = dictionary[chosen_isa];
   // Check if this requires a pnacl-translate, otherwise just grab the URL.
   // We may have pnacl-translate for isa-specific bitcode for CPU tuning.
   if (isa_spec.isMember(kPnaclTranslateKey)) {
-    *url = isa_spec[kPnaclTranslateKey][kUrlKey].asString();
+    GrabUrlAndCacheIdentity(isa_spec[kPnaclTranslateKey], url, cache_identity);
     *pnacl_translate = true;
   } else {
-    *url = isa_spec[kUrlKey].asString();
+    GrabUrlAndCacheIdentity(isa_spec[kPnaclTranslateKey], url, cache_identity);

[sehr (please use chromium), 2012/02/22 19:30:37]

The if guard makes sure that the dictionary index here will return an empty
collection, I think.

[jvoung - send to chromium..., 2012/02/22 19:45:37]

Good catch thanks!  Copy-paste bug =(

     *pnacl_translate = false;
   }
+
   return true;
 }
 
 bool GetKeyUrl(const Json::Value& dictionary,
                const nacl::string& key,
                const nacl::string& sandbox_isa,
                const Manifest* manifest,
                bool prefer_portable,
                nacl::string* full_url,
+               nacl::string* cache_identity,
                ErrorInfo* error_info,
                bool* pnacl_translate) {
   CHECK(full_url != NULL && error_info != NULL);
-  *full_url = "";
-  *pnacl_translate = false;
   if (!dictionary.isMember(key)) {
     error_info->SetReport(ERROR_MANIFEST_RESOLVE_URL,
                           "file key not found in manifest");
     return false;
   }
   const Json::Value& isa_dict = dictionary[key];
   nacl::string error_string;
   nacl::string relative_url;
   if (!GetURLFromISADictionary(isa_dict, key, sandbox_isa, prefer_portable,
-                               &relative_url, &error_string, pnacl_translate)) {
+                               &relative_url, cache_identity,
+                               &error_string, pnacl_translate)) {
     error_info->SetReport(ERROR_MANIFEST_RESOLVE_URL,
                           key + nacl::string(" manifest resolution error: ") +
                           error_string);
     return false;
   }
   return manifest->ResolveURL(relative_url, full_url, error_info);
 }
 
 }  // namespace
 
@@ skipping 114 matching lines @@
         "could not resolve url '" + relative_url +
         "' relative to manifest base url '" + manifest_base_url_.c_str() +
         "'.");
     return false;
   }
   *full_url = resolved_url.AsString();
   return true;
 }
 
 bool JsonManifest::GetProgramURL(nacl::string* full_url,
+                                 nacl::string* cache_identity,
                                  ErrorInfo* error_info,
                                  bool* pnacl_translate) const {
-  if (full_url == NULL || error_info == NULL || pnacl_translate == NULL)
+  if (full_url == NULL || cache_identity == NULL ||
+      error_info == NULL || pnacl_translate == NULL)
     return false;
 
   Json::Value program = dictionary_[kProgramKey];
 
   nacl::string nexe_url;
   nacl::string error_string;
 
   if (!GetURLFromISADictionary(program,
                                kProgramKey,
                                sandbox_isa_,
                                prefer_portable_,
                                &nexe_url,
+                               cache_identity,
                                &error_string,
                                pnacl_translate)) {
     error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL,
                           nacl::string("program:") + sandbox_isa_ +
                           error_string);
     return false;
   }
 
   return ResolveURL(nexe_url, full_url, error_info);
 }
 
 bool JsonManifest::GetFileKeys(std::set<nacl::string>* keys) const {
   if (!dictionary_.isMember(kFilesKey)) {
     // trivial success: no keys when there is no "files" section.
     return true;
   }
   const Json::Value& files = dictionary_[kFilesKey];
   CHECK(files.isObject());
   Json::Value::Members members = files.getMemberNames();
   for (size_t i = 0; i < members.size(); ++i) {
     keys->insert(members[i]);
   }
   return true;
 }
 
 bool JsonManifest::ResolveKey(const nacl::string& key,
                               nacl::string* full_url,
+                              nacl::string* cache_identity,
                               ErrorInfo* error_info,
                               bool* pnacl_translate) const {
   NaClLog(3, "JsonManifest::ResolveKey(%s)\n", key.c_str());
   // key must be one of kProgramKey or kFileKey '/' file-section-key
 
-  if (full_url == NULL || error_info == NULL || pnacl_translate == NULL)
+  if (full_url == NULL || cache_identity == NULL ||
+      error_info == NULL || pnacl_translate == NULL)
     return false;
 
-  *full_url = "";
-  *pnacl_translate = false;
   if (key == kProgramKey) {
     return GetKeyUrl(dictionary_, key, sandbox_isa_, this, prefer_portable_,
-                     full_url, error_info, pnacl_translate);
+                     full_url, cache_identity, error_info, pnacl_translate);
   }
   nacl::string::const_iterator p = find(key.begin(), key.end(), '/');
   if (p == key.end()) {
     error_info->SetReport(ERROR_MANIFEST_RESOLVE_URL,
                           nacl::string("ResolveKey: invalid key, no slash: ")
                           + key);
     return false;
   }
 
   // generalize to permit other sections?
@@ skipping 14 matching lines @@
         nacl::string("ResolveKey: no \"files\" dictionary"));
     return false;
   }
   if (!files.isMember(rest)) {
     error_info->SetReport(
         ERROR_MANIFEST_RESOLVE_URL,
         nacl::string("ResolveKey: no such \"files\" entry: ") + key);
     return false;
   }
   return GetKeyUrl(files, rest, sandbox_isa_, this, prefer_portable_,
-                   full_url, error_info, pnacl_translate);
+                   full_url, cache_identity, error_info, pnacl_translate);
 }
 
 }  // namespace plugin