Non-SFI NaCl: Batch-open resource files

components/nacl/common/nacl_types.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
   kNativeNaClProcessType,
   // Runs user-provided code that is translated from *bitcode* by an
   // in-browser PNaCl translator.
   kPNaClProcessType,
   // Runs pnacl-llc/linker *native* code. These nexes are browser-provided
   // (not user-provided).
   kPNaClTranslatorProcessType,
   kNumNaClProcessTypes
 };
 
+struct NaClResourceFileInfo {
+  NaClResourceFileInfo();
+  NaClResourceFileInfo(IPC::PlatformFileForTransit file,
+                       uint64_t file_token_lo,
+                       uint64_t file_token_hi);
+  NaClResourceFileInfo(IPC::PlatformFileForTransit file,
+                       uint64_t file_token_lo,
+                       uint64_t file_token_hi,
+                       const std::string& key);
+  ~NaClResourceFileInfo();
+
+  IPC::PlatformFileForTransit file;
+  uint64_t file_token_lo;

[Mark Seaborn, 2015/02/12 03:57:33]

Could you use NaClFileToken instead of two uint64_t fields here?

If necessary, you can move the definition of NaClFileToken from
nacl_process_host.h to here.

The reasons for passing the two fields around separately are historical.  I
think it's because NaClFileToken used to be defined in the NaCl repo.

Then, rather than doing
  file_token_lo(0),
  file_token_hi(0)
in constructors, you could just add a constructor to NaClFileToken to initialise
that.

[Yusuke Sato, 2015/02/13 23:01:17]

Done (removed the class)

+  uint64_t file_token_hi;
+  std::string key;  // a key for open_resource
+};
+
 // Parameters sent to the NaCl process when we start it.
 struct NaClStartParams {
+  struct ResourceFileInfo {
+    ResourceFileInfo();
+    ResourceFileInfo(IPC::PlatformFileForTransit file,
+                     const base::FilePath& file_path,
+                     const std::string& file_key);
+    ~ResourceFileInfo();
+
+    IPC::PlatformFileForTransit file;
+    base::FilePath file_path;  // a key for validation caching
+    std::string file_key;  // a key for open_resource
+  };
+
   NaClStartParams();
   ~NaClStartParams();
 
+  void CheckNumOfDescriptors();
+
   IPC::PlatformFileForTransit nexe_file;
   // Used only as a key for validation caching.
   base::FilePath nexe_file_path_metadata;
 
+  std::vector<ResourceFileInfo> resource_files;

[Mark Seaborn, 2015/02/12 03:57:33]

How about "prefetched_resource_files"?

There are various places where you could add a "prefetched_" prefix to make the
code more self-describing.

[Yusuke Sato, 2015/02/13 23:01:16]

Done.

   std::vector<FileDescriptor> handles;
   FileDescriptor debug_stub_server_bound_socket;
 
   bool validation_cache_enabled;
   std::string validation_cache_key;
   // Chrome version string. Sending the version string over IPC avoids linkage
   // issues in cases where NaCl is not compiled into the main Chromium
   // executable or DLL.
   std::string version;
 
   bool enable_debug_stub;
   bool enable_ipc_proxy;
 
   // Enables plugin code to use Mojo APIs. See mojo/nacl for details.
   bool enable_mojo;
 
   NaClAppProcessType process_type;
 
   // For NaCl <-> renderer crash information reporting.
   base::SharedMemoryHandle crash_info_shmem_handle;
 
   // NOTE: Any new fields added here must also be added to the IPC
   // serialization in nacl_messages.h and (for POD fields) the constructor
-  // in nacl_types.cc.
+  // in nacl_types.cc. Any new fields added for passing file handles must
+  // also be checked in NaClStartParams::CheckNumOfDescriptors().
 };
 
 // Parameters sent to the browser process to have it launch a NaCl process.
 //
 // If you change this, you will also need to update the IPC serialization in
 // nacl_host_messages.h.
 struct NaClLaunchParams {
   NaClLaunchParams();
-  NaClLaunchParams(const std::string& manifest_url,
-                   const IPC::PlatformFileForTransit& nexe_file,
-                   uint64_t nexe_token_lo,
-                   uint64_t nexe_token_hi,
-                   int render_view_id,
-                   uint32 permission_bits,
-                   bool uses_nonsfi_mode,
-                   NaClAppProcessType process_type);
+  NaClLaunchParams(
+      const std::string& manifest_url,
+      const IPC::PlatformFileForTransit& nexe_file,
+      uint64_t nexe_token_lo,
+      uint64_t nexe_token_hi,
+      const std::vector<NaClResourceFileInfo>& resource_files,
+      int render_view_id,
+      uint32 permission_bits,
+      bool uses_nonsfi_mode,
+      NaClAppProcessType process_type);
   ~NaClLaunchParams();
 
   std::string manifest_url;
   // On Windows, the HANDLE passed here is valid in the renderer's context.
   // It's the responsibility of the browser to duplicate this handle properly
   // for passing it to the plugin.
   IPC::PlatformFileForTransit nexe_file;
   uint64_t nexe_token_lo;
   uint64_t nexe_token_hi;
+  std::vector<NaClResourceFileInfo> resource_files_info;
 
   int render_view_id;
   uint32 permission_bits;
   bool uses_nonsfi_mode;
 
   NaClAppProcessType process_type;
 };
 
 struct NaClLaunchResult {
   NaClLaunchResult();
@@ skipping 23 matching lines @@
   base::ProcessId plugin_pid;
   int plugin_child_id;
 
   // For NaCl <-> renderer crash information reporting.
   base::SharedMemoryHandle crash_info_shmem_handle;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_COMMON_NACL_TYPES_H_