Non-SFI NaCl: Batch-open resource files

components/nacl/loader/nonsfi/nonsfi_listener.cc

 // Copyright 2014 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.
 
 #include "components/nacl/loader/nonsfi/nonsfi_listener.h"
 
 #include "base/command_line.h"
 #include "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/loader/nacl_trusted_listener.h"
 #include "components/nacl/loader/nonsfi/irt_random.h"
 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ppapi/nacl_irt/plugin_startup.h"
 
 #if !defined(OS_LINUX)
 # error "non-SFI mode is supported only on linux."
 #endif
 
 namespace nacl {
 namespace nonsfi {
 
+void RegisterPreopenedDescriptors(const std::vector<std::string>& keys,

[teravest, 2014/10/24 16:18:06]

Why is this defined in another file?

[Yusuke Sato, 2014/11/04 22:50:21]

Because nacl::nonsfi::IrtOpenResource() in
components/nacl/loader/nonsfi/irt_resource_open.cc will consume the FDs? Please
let me know if you know a better way to do this.

+                                  const std::vector<int>& fds);
+
 NonSfiListener::NonSfiListener() : io_thread_("NaCl_IOThread"),
                                    shutdown_event_(true, false) {
   io_thread_.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 }
 
 NonSfiListener::~NonSfiListener() {
 }
 
 void NonSfiListener::Listen() {
@@ skipping 99 matching lines @@
   CHECK(params.debug_stub_server_bound_socket.fd == -1);
 
   CHECK(params.handles.empty());
   // We are only expecting non-SFI mode to be used with NaCl for now,
   // not PNaCl processes.
   CHECK(params.process_type == kNativeNaClProcessType);
 
   CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
   CHECK(params.nexe_file_path_metadata.empty());
 
+  CHECK(params.resource_keys.size() == params.resource_files.size());
+  std::vector<base::PlatformFile> fds;
+  for (size_t i = 0; i < params.resource_files.size(); ++i) {
+    fds.push_back(
+        IPC::PlatformFileForTransitToPlatformFile(params.resource_files[i]));
+  }
+  RegisterPreopenedDescriptors(params.resource_keys, fds);
+
   MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file));
 }
 
 }  // namespace nonsfi
 }  // namespace nacl