Non-SFI NaCl: Batch-open resource files

ppapi/api/private/ppb_nacl_private.idl

Index: ppapi/api/private/ppb_nacl_private.idl
diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl
index ba2b693a857586603f4eb0488a68cd3dd7734857..40a642b66abf8740a9673c29c911279e43104694 100644
--- a/ppapi/api/private/ppb_nacl_private.idl
+++ b/ppapi/api/private/ppb_nacl_private.idl
@@ -154,8 +154,7 @@ struct PP_PNaClOptions {
 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;
 
@@ -164,6 +163,16 @@ struct PP_NaClFileInfo {
   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
@@ -180,6 +189,8 @@ interface PPB_NaCl_Private {
                     [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,
@@ -343,7 +354,10 @@ interface PPB_NaCl_Private {
    */
   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.