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"
@@ skipping 15 matching lines @@
 #include "components/nacl/loader/nonsfi/irt_random.h"
 #endif
 
 #if !defined(OS_LINUX) && !defined(OS_NACL_NONSFI)
 # error "non-SFI mode is supported only on linux."
 #endif
 
 namespace nacl {
 namespace nonsfi {
 
+void RegisterPreopenedDescriptors(
+    const std::vector<std::pair<std::string, int> >& key_fd_pairs);
+
 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 103 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());
 
+#if !defined(OS_NACL_NONSFI)

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

When we move the irt implementation to ppapi/nacl_irt/ then we do not need this
ifdef guard.

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

I don't understand why you need to conditionalise this new code with
!defined(OS_NACL_NONSFI) in nonsfi_listener.cc.

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

removed

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

removed

+  std::vector<std::pair<std::string, int> > key_fd_pairs;

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

You're converting to a std::vector here only to have
RegisterPreopenedDescriptors() convert to a std::map.  Can you avoid having an
intermediate representation?

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

Since params.resource_files is a struct defined in
components/nacl/common/nacl_types.h, passing the struct directly to
ppapi/nacl_irt/manifest_service.cc doesn't seem possible (ppapi/nacl_irt/DEPS
does not have the path.)

Can I keep this? Or can I add components/nacl/common/ to ppapi/nacl_irt/DEPS?

[Mark Seaborn, 2015/02/04 18:52:16]

I think it would be OK to add components/nacl/common/ to ppapi/nacl_irt/DEPS,
although ppapi/ doesn't contain any #includes of components/nacl/ at the moment.
 It might be cleaner to move ppapi/nacl_irt/manifest_service.cc to
components/nacl/.  However, I don't think that's necessary...

How about just passing a pointer to a std::map to
RegisterPreopenedDescriptors()?

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

Done.

+  for (size_t i = 0; i < params.resource_files.size(); ++i) {
+    key_fd_pairs.push_back(std::make_pair(
+        params.resource_files[i].file_key,
+        IPC::PlatformFileForTransitToPlatformFile(
+            params.resource_files[i].file)));
+  }
+
+  RegisterPreopenedDescriptors(key_fd_pairs);
+#endif
+
   MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file));
 }
 
 }  // namespace nonsfi
 }  // namespace nacl