Connect PPAPI IPC channels for non-SFI mode.

components/nacl/loader/nonsfi/nonsfi_main.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_main.h"
 
+#include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/threading/platform_thread.h"
 #include "components/nacl/loader/nonsfi/elf_loader.h"
 #include "components/nacl/loader/nonsfi/irt_interfaces.h"
 #include "native_client/src/include/elf_auxv.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/public/secure_service.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nrd_all_modules.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 namespace nacl {
 namespace nonsfi {
 namespace {
 
+typedef void (*EntryPointType)(uintptr_t *);

[Mark Seaborn, 2014/02/19 17:00:30]

Nit: "uintptr_t*" (to follow Chrome spacing style)

[hidehiko, 2014/02/20 18:50:01]

Done.

+
+class PluginMainDelegate : public base::PlatformThread::Delegate {
+ public:
+  explicit PluginMainDelegate(EntryPointType entry_point)
+      : entry_point_(entry_point) {
+  }
+
+  virtual ~PluginMainDelegate() {
+  }
+
+  virtual void ThreadMain() OVERRIDE {
+    base::PlatformThread::SetName("NaClMainThread");
+
+    uintptr_t info[] = {
+      0,  // Do not use fini.
+      0,  // envc.
+      0,  // argc.
+      0,  // Null terminate for argv.
+      0,  // Null terminate for envv.
+      AT_SYSINFO,
+      reinterpret_cast<uintptr_t>(&NaClIrtInterface),
+      AT_NULL,
+      0,  // Null terminate for auxv.
+    };
+    entry_point_(info);
+  }
+
+ private:
+  EntryPointType entry_point_;
+};
+
+// Default stack size of the plugin main thread. We heuristically chose 1M.
+const size_t kStackSize = 1024 * 1024;

[Mark Seaborn, 2014/02/19 17:00:30]

NaCl uses 16MB for the initial stack size (see NACL_DEFAULT_STACK_MAX), so it
would be good to use the same number here.

[hidehiko, 2014/02/20 18:50:01]

Good to know. Done.

+
 struct NaClDescUnrefer {
   void operator()(struct NaClDesc* desc) const {
     NaClDescUnref(desc);
   }
 };
 
 void LoadModuleRpc(struct NaClSrpcRpc* rpc,
                    struct NaClSrpcArg** in_args,
                    struct NaClSrpcArg** out_args,
                    struct NaClSrpcClosure* done_cls) {
   rpc->result = NACL_SRPC_RESULT_INTERNAL;
 
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> desc(in_args[0]->u.hval);
   ElfImage image;
   if (image.Read(desc.get()) != LOAD_OK) {
     LOG(ERROR) << "LoadModuleRpc: Failed to read binary.";
     return;
   }
 
   if (image.Load(desc.get()) != LOAD_OK) {
     LOG(ERROR) << "LoadModuleRpc: Failed to load the image";
     return;
   }
 
-  uintptr_t entry_point = image.entry_point();
+  EntryPointType entry_point =
+      reinterpret_cast<EntryPointType>(image.entry_point());
+  if (!base::PlatformThread::CreateNonJoinable(
+          kStackSize, new PluginMainDelegate(entry_point))) {
+    LOG(ERROR) << "LoadModuleRpc: Failed to create plugin main thread.";
+    return;
+  }
+
   rpc->result = NACL_SRPC_RESULT_OK;
-
-  // Run for testing. TODO(hidehiko): Remove this.
-  uintptr_t info[] = {
-    0,  // Do not use fini.
-    0,  // envc.
-    0,  // argc.
-    0,  // Null terminate for argv.
-    0,  // Null terminate for envv.
-    AT_SYSINFO,
-    reinterpret_cast<uintptr_t>(&NaClIrtInterface),
-    AT_NULL,
-    0,  // Null terminate for auxv.
-  };
-  reinterpret_cast<void (*)(uintptr_t*)>(entry_point)(info);
+  (*done_cls->Run)(done_cls);
 }
 
 const static struct NaClSrpcHandlerDesc kNonSfiServiceHandlers[] = {
   { NACL_SECURE_SERVICE_LOAD_MODULE, LoadModuleRpc, },
   { static_cast<const char*>(NULL), static_cast<NaClSrpcMethod>(NULL), },
 };
 
 // Creates two socketpairs to communicate with the host process.
 void CreateSecureSocketPair(struct NaClDesc* secure_pair[2],
                             struct NaClDesc* pair[2]) {
@@ skipping 86 matching lines @@
     LOG(ERROR) << "MainStart: Failed to set up bootstrap channel.";
     return;
   }
 
   // Start the SRPC server loop.
   ServiceAccept(secure_port.get());
 }
 
 }  // namespace nonsfi
 }  // namespace nacl