Add ability to load pnacl resources from DIR_PNACL_COMPONENT.

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 26 matching lines @@
 
 // This is here due to a Windows API collision; plugin.h through
 // file_downloader.h transitively includes Instance.h which defines a
 // PostMessage method, so this undef must appear before any of those.
 #ifdef PostMessage
 #undef PostMessage
 #endif
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/pnacl_coordinator.h"
+#include "native_client/src/trusted/plugin/pnacl_resources.h"
 #include "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
 #include "native_client/src/trusted/plugin/srpc_client.h"
 #include "native_client/src/trusted/plugin/utility.h"
 
 #include "native_client/src/trusted/weak_ref/call_on_main_thread.h"
 
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_imc_api.h"
 
 #include "ppapi/c/pp_errors.h"
@@ skipping 180 matching lines @@
     // manifest.
     NaClLog(4,
             "OpenManifestEntry: failed for key %s, code %d (%s)\n",
             url_key.c_str(),
             error_info.error_code(),
             error_info.message().c_str());
   }
   return true;
 }
 
 void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(

[robertm, 2012/08/08 21:51:11]

maybe say what has happened so far when this is call
and what this function does.

[jvoung - send to chromium..., 2012/08/08 22:47:04]

Done.

     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;
@@ skipping 15 matching lines @@
 
   open_cont = new OpenManifestEntryResource(*p);  // copy ctor!
   CHECK(open_cont != NULL);
   open_cont->url = mapped_url;
   if (!open_cont->pnacl_translate) {
     pp::CompletionCallback stream_cc = WeakRefNewCallback(
         anchor_,
         this,
         &PluginReverseInterface::StreamAsFile_MainThreadContinuation,
         open_cont);
-    if (!plugin_->StreamAsFile(mapped_url,
-                               stream_cc.pp_completion_callback())) {
+    //
+    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_);

[robertm, 2012/08/08 21:51:11]

add comment for what is being woken up here

[jvoung - send to chromium..., 2012/08/08 22:47:04]

There's a bunch of these Broadcasts all over the file... so I'll add a comment
to the function.  Basically each Foo() waits on Foo_MainThreadContinuation() or
some Foo_followup_MainThreadContinuation(), if Foo needs multiple steps on the
main thread.

Added a comment to the first Foo_MainThreadContinuation() function
(OpenManifestEntry_MainThreadContinuation()).

+        return;
+      }
       NaClLog(4,
-              "OpenManifestEntry_MainThreadContinuation: "
-              "StreamAsFile failed\n");
+              "OpenManifestEntry_MainThreadContinuation: StreamAsFile okay\n");
+    } else {
+      int32_t fd = PnaclResources::GetPnaclFD(
+          plugin_,
+          PnaclUrls::StripPnaclComponentPrefix(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 = -1;       // but failed.
-      p->error_info->SetReport(ERROR_MANIFEST_OPEN,
-                               "ServiceRuntime: StreamAsFile failed");
+      *p->op_complete_ptr = true;  // done!
+      *p->out_desc = fd;
       NaClXCondVarBroadcast(&cv_);

[robertm, 2012/08/08 21:51:11]

dito

[jvoung - send to chromium..., 2012/08/08 22:47:04]

Done.

-      return;
+      NaClLog(4,
+              "OpenManifestEntry_MainThreadContinuation: GetPnaclFd okay\n");
     }
-    NaClLog(4,
-            "OpenManifestEntry_MainThreadContinuation: StreamAsFile okay\n");
   } else {
     NaClLog(4,
             "OpenManifestEntry_MainThreadContinuation: "
             "pulling down and translating.\n");
     pp::CompletionCallback translate_callback =
         WeakRefNewCallback(
             anchor_,
             this,
             &PluginReverseInterface::BitcodeTranslate_MainThreadContinuation,
             open_cont);
@@ skipping 495 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return "";
   }
 }
 
 }  // namespace plugin