Implement open_resource in non-SFI mode.

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

 /* -*- c++ -*- */
 /*
  * 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.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
@@ skipping 65 matching lines @@
 };
 
 // Callback resources are essentially our continuation state.
 struct PostMessageResource {
  public:
   explicit PostMessageResource(std::string msg)
       : message(msg) {}
   std::string message;
 };
 
+class OpenManifestEntryAsyncCallback;

[Mark Seaborn, 2014/04/30 21:20:58]

Shouldn't forward decls be grouped together near the file's start?

[hidehiko, 2014/05/01 05:20:31]

Done.

+
 struct OpenManifestEntryResource {
  public:
   OpenManifestEntryResource(const std::string& target_url,
                             struct NaClFileInfo* finfo,
-                            bool* op_complete)
+                            bool* op_complete,
+                            OpenManifestEntryAsyncCallback* callback)
       : url(target_url),
         file_info(finfo),
-        op_complete_ptr(op_complete) {}
+        op_complete_ptr(op_complete),
+        callback(callback) {}
+  ~OpenManifestEntryResource();
+  void MaybeRunCallback(int32_t pp_error);
+
   std::string url;
   struct NaClFileInfo* file_info;
   bool* op_complete_ptr;
+  OpenManifestEntryAsyncCallback* callback;
 };
 
 struct CloseManifestEntryResource {
  public:
   CloseManifestEntryResource(int32_t desc_to_close,
                              bool* op_complete,
                              bool* op_result)
       : desc(desc_to_close),
         op_complete_ptr(op_complete),
         op_result_ptr(op_result) {}
@@ skipping 56 matching lines @@
   virtual void ReportExitStatus(int exit_status);
 
   virtual int64_t RequestQuotaForWrite(nacl::string file_id,
                                        int64_t offset,
                                        int64_t bytes_to_write);
 
   void AddQuotaManagedFile(const nacl::string& file_id,
                            const pp::FileIO& file_io);
   void AddTempQuotaManagedFile(const nacl::string& file_id);
 
+  // This is a sibling of OpenManifestEntry. While OpenManifestEntry is
+  // sync function and must be called on a non-main thread, this must be

[Mark Seaborn, 2014/04/30 21:20:58]

Nit: "a sync function"?  "this" -> "OpenManifestEntryAsync" to disambiguate?

[hidehiko, 2014/05/01 05:20:31]

Done.

+  // called on the main thread. Upon completion (even on error), callback will
+  // be invoked. The caller has responsibility to keep the memory passed to
+  // info until callback is invoked.
+  void OpenManifestEntryAsync(const nacl::string& key,
+                              struct NaClFileInfo* info,
+                              OpenManifestEntryAsyncCallback* callback);
+
  protected:
   virtual void PostMessage_MainThreadContinuation(PostMessageResource* p,
                                                   int32_t err);
 
   virtual void OpenManifestEntry_MainThreadContinuation(
       OpenManifestEntryResource* p,
       int32_t err);
 
   virtual void StreamAsFile_MainThreadContinuation(
       OpenManifestEntryResource* p,
@@ skipping 102 matching lines @@
   int exit_status_;
   bool start_sel_ldr_done_;
 
   PP_Var start_sel_ldr_error_message_;
   pp::CompletionCallbackFactory<ServiceRuntime> callback_factory_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_