Move PNaCl process startup back to the main thread.

components/nacl/renderer/plugin/pnacl_coordinator.h

 // Copyright (c) 2012 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_RENDERER_PLUGIN_PNACL_COORDINATOR_H_
 #define COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_COORDINATOR_H_
 
 #include <vector>
 
 #include "components/nacl/renderer/plugin/nacl_subprocess.h"
@@ skipping 14 matching lines @@
 class PnaclCoordinator;
 class PnaclTranslateThread;
 class TempFile;
 
 // A class invoked by Plugin to handle PNaCl client-side translation.
 // Usage:
 // (1) Invoke the factory method, e.g.,
 //     PnaclCoordinator* coord = BitcodeToNative(plugin,
 //                                               "http://foo.com/my.pexe",
 //                                               pnacl_options,
-//                                               TranslateNotifyCallback);
-// (2) TranslateNotifyCallback gets invoked when translation is complete.
+//                                               translate_notify_callback);
+// (2) translate_notify_callback gets invoked when translation is complete.
 //     If the translation was successful, the pp_error argument is PP_OK.
 //     Other values indicate errors.
 // (3) After finish_callback runs, get the file descriptor of the translated
 //     nexe, e.g.,
-//     fd = coord->ReleaseTranslatedFD();
+//     fd = coord->TakeTranslatedFileHandle();
 // (4) Load the nexe from "fd".
 // (5) delete coord.
 //
 // Translation proceeds in two steps:
 // (1) llc translates the bitcode in pexe_url_ to an object in obj_file_.
 // (2) ld links the object code in obj_file_ and produces a nexe in nexe_file_.
 class PnaclCoordinator {
  public:
   // Maximum number of object files passable to the translator. Cannot be
   // changed without changing the RPC signatures.
@@ skipping 47 matching lines @@
                    const pp::CompletionCallback& translate_notify_callback);
 
   // Invoke to issue a GET request for bitcode.
   void OpenBitcodeStream();
 
   // Invoked when a pexe data chunk is compiled.
   void BitcodeGotCompiled(int32_t pp_error, int64_t bytes_compiled);
   // Once llc and ld nexes have been loaded and the two temporary files have
   // been created, this starts the translation.  Translation starts two
   // subprocesses, one for llc and one for ld.
-  void RunTranslate(int32_t pp_error);
+  void LoadCompiler();
+  void RunCompile(int32_t pp_error, int64_t compile_load_start_time);
+  void LoadLinker(int32_t pp_error);
+  void RunLink(int32_t pp_error, int64_t ld_load_start_time);
 
   // Invoked when translation is finished.
   void TranslateFinished(int32_t pp_error);
 
   // Invoked when the read descriptor for nexe_file_ is created.
   void NexeReadDidOpen(int32_t pp_error);
 
   // Bring control back to the plugin by invoking the
   // |translate_notify_callback_|.  This does not set the ErrorInfo report,
   // it is assumed that it was already set.
@@ skipping 21 matching lines @@
   // notified via ReportTranslationFinished. If it is not set before
   // plugin/coordinator destruction, the destructor will call
   // ReportTranslationFinished.
   bool translation_finished_reported_;
   // Threadsafety is required to support file lookups.
   pp::CompletionCallbackFactory<PnaclCoordinator,
                                 pp::ThreadSafeThreadTraits> callback_factory_;
 
   // An auxiliary class that manages downloaded resources (llc and ld nexes).
   nacl::scoped_ptr<PnaclResources> resources_;
+  NaClSubprocess compiler_subprocess_;
+  NaClSubprocess ld_subprocess_;
 
   // The URL for the pexe file.
   std::string pexe_url_;
   // Options for translation.
   PP_PNaClOptions pnacl_options_;
   // Architecture-specific attributes used for translation. These are
   // supplied by Chrome, not the developer, and are therefore different
   // from PNaCl options.
   std::string architecture_attributes_;
 
@@ skipping 23 matching lines @@
   // The helper thread used to do translations via SRPC.
   // It accesses fields of PnaclCoordinator so it must have a
   // shorter lifetime.
   nacl::scoped_ptr<PnaclTranslateThread> translate_thread_;
 };
 
 //----------------------------------------------------------------------
 
 }  // namespace plugin;
 #endif  // COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_COORDINATOR_H_