Non-SFI NaCl: Batch-open resource files

ppapi/api/private/ppb_nacl_private.idl

 /* 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.
  */
 
 /* This file contains NaCl private interfaces. This interface is not versioned
  * and is for internal Chrome use. It may change without notice. */
 
 label Chrome {
   M25 = 1.0
@@ skipping 136 matching lines @@
 struct PP_PNaClOptions {
   PP_Bool translate;
   PP_Bool is_debug;
   int32_t opt_level;
 };
 
 /* Callback invoked upon completion of PPP_ManifestService::OpenResource(). */
 typedef void PP_OpenResourceCompletionCallback([inout] mem_t user_data,
                                                [in] PP_FileHandle file_handle);
 
-/* Corresponds to NaClFileInfo in
- * native_client/src/trusted/validator/nacl_file_info.h */
+/* Corresponds to NaClFileInfo in native_client/src/public/nacl_file_info.h */
 struct PP_NaClFileInfo {
   PP_FileHandle handle;
 
   /* See NaClFileToken comment in nacl_file_info.h */
   uint64_t token_lo;
   uint64_t token_hi;
 };
 
+struct PP_NaClResourceFileHandle {
+  PP_FileHandle handle;
+
+  /* See NaClFileToken comment in nacl_file_info.h */
+  uint64_t token_lo;
+  uint64_t token_hi;
+
+  str_t key;

[hidehiko, 2015/01/28 09:05:20]

Could you add a comment about the memory management about key.

[Yusuke Sato, 2015/02/04 02:00:29]

Done.

+};
+
 /* PPB_NaCl_Private */
 interface PPB_NaCl_Private {
   /* Launches NaCl's sel_ldr process.  Returns PP_EXTERNAL_PLUGIN_OK on success
    * and writes a NaClHandle to imc_handle. Returns PP_EXTERNAL_PLUGIN_FAILED on
    * failure. The |enable_ppapi_dev| parameter controls whether GetInterface
    * returns 'Dev' interfaces to the NaCl plugin.
    * The |nexe_file_info| is currently used only in non-SFI mode. It is the
    * file handle for the main nexe file, which should be initially loaded.
    * LaunchSelLdr takes the ownership of the file handle.
    * The |uses_nonsfi_mode| flag indicates whether or not nonsfi-mode should
    * be used with the binary pointed by the url.
    */
   void LaunchSelLdr([in] PP_Instance instance,
                     [in] PP_Bool main_service_runtime,
                     [in] str_t alleged_url,
                     [in] PP_NaClFileInfo nexe_file_info,
+                    [in] PP_NaClResourceFileHandle[] resource_file_handles,

[Mark Seaborn, 2015/02/02 23:21:51]

If I understand this correctly, DownloadNexe() returns a list of file handles,
which src/trusted/plugin/ holds onto and passes back to LaunchSelLdr() later.

That shouldn't be necessary.  You can keep the list of handles entirely within
ppb_nacl_private_impl.cc without having to pass them into src/trusted/plugin/,
which doesn't need to process them.

(BTW, src/trusted/plugin/ is now at components/nacl/renderer/plugin/.)

If you need to store the file handle list as per-instance state in
ppb_nacl_private_impl.cc, you can add it to NaClPluginInstance (which I
introduced recently).

[Yusuke Sato, 2015/02/05 07:21:13]

Done.

+                    [in] uint32_t resource_file_handles_len,
                     [in] PP_Bool uses_nonsfi_mode,
                     [in] PP_Bool enable_ppapi_dev,
                     [in] PP_NaClAppProcessType process_type,
                     [out] mem_t imc_handle,
                     [in] PP_CompletionCallback callback);
 
   /* This function starts the IPC proxy so the nexe can communicate with the
    * browser.
    */
   PP_Bool StartPpapiProxy(PP_Instance instance);
@@ skipping 143 matching lines @@
   //   http://llvm.org/docs/CommandGuide/llc.html#cmdoption-mattr
   PP_Var GetCpuFeatureAttrs();
 
   /* Downloads the .nexe file at the given URL to a file, and sets |file_info|
    * to information for a handle to a file containing its contents.
    * If metadata for identity-based validation caching is available
    * then it sets token information in |file_info| (otherwise left untouched).
    */
   void DownloadNexe([in] PP_Instance instance,
                     [in] str_t url,
+                    [in] PP_Bool download_resource_files,
                     [out] PP_NaClFileInfo file_info,
+                    [out] PP_NaClResourceFileHandle[] resource_file_handles,
+                    [out] uint32_t resource_file_handles_len,
                     [in] PP_CompletionCallback callback);
 
   /* Reports the status of sel_ldr for UMA reporting.
    * |max_status| has to be provided because the implementation of this
    * interface can't access the NaClErrorCode enum.
    */
   void ReportSelLdrStatus([in] PP_Instance instance,
                           [in] int32_t load_status,
                           [in] int32_t max_status);
 
@@ skipping 26 matching lines @@
    * Otherwise, |stream_callback| is called repeatedly with blocks of data
    * as they are received. |stream_finished_callback| is called after all
    * data has been received and dispatched to |stream_callback|.
    */
   void StreamPexe([in] PP_Instance instance,
                   [in] str_t pexe_url,
                   [in] int32_t opt_level,
                   [in] PPP_PexeStreamHandler stream_handler,
                   [inout] mem_t stream_handler_user_data);
 };