Pepper: Narrow locking at ld subprocess start.

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc

 // 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.
 
 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h"
 
 #include <iterator>
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "ppapi/cpp/var.h"
@@ skipping 321 matching lines @@
                       "Link process could not reset object file");
       return false;
     }
     ld_in_files.push_back((*obj_files_)[i]->read_wrapper());
   }
   for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     ld_in_files.push_back(invalid_desc_wrapper_);
 
   nacl::DescWrapper* ld_out_file = nexe_file_->write_wrapper();
   pp::Core* core = pp::Module::Get()->core();
+  int64_t ld_start_time = NaClGetTimeOfDayMicroseconds();
+  PP_FileHandle ld_file_handle = resources_->TakeLdFileHandle();
+  // On success, ownership of ld_file_handle is transferred.
+  nacl::scoped_ptr<NaClSubprocess> ld_subprocess(
+      plugin_->LoadHelperNaClModule(resources_->GetLlcUrl(),
+                                    ld_file_handle,
+                                    &error_info));
+  if (ld_subprocess.get() == NULL) {
+    if (ld_file_handle != PP_kInvalidFileHandle)
+      CloseFileHandle(ld_file_handle);
+    TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
+                    "Link process could not be created: " +
+                    error_info.message());
+    return false;
+  }
+  core->CallOnMainThread(0,
+                         coordinator_->GetUMATimeCallback(
+                             "NaCl.Perf.PNaClLoadTime.LoadLinker",
+                             NaClGetTimeOfDayMicroseconds() - ld_start_time),
+                         PP_OK);
+
   {
-    // Create LD process
     nacl::MutexLocker ml(&subprocess_mu_);
-    int64_t ld_start_time = NaClGetTimeOfDayMicroseconds();
-    PP_FileHandle ld_file_handle = resources_->TakeLdFileHandle();
-
-    // On success, ownership of ld_file_handle is transferred.
-    ld_subprocess_.reset(plugin_->LoadHelperNaClModule(
-        resources_->GetLdUrl(), ld_file_handle, &error_info));
-    if (ld_subprocess_ == NULL) {
-      if (ld_file_handle != PP_kInvalidFileHandle)
-        CloseFileHandle(ld_file_handle);
-      TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
-                      "Link process could not be created: " +
-                      error_info.message());
+    // If we received a call to AbortSubprocesses() before we had a chance to
+    // set llc_subprocess_, shut down and clean up the subprocess started here.
+    if (subprocesses_aborted_) {
+      ld_subprocess->service_runtime()->Shutdown();
       return false;
     }
+    DCHECK(ld_subprocess_.get() == NULL);
+    ld_subprocess_.swap(ld_subprocess);
     ld_subprocess_active_ = true;
-    core->CallOnMainThread(0,
-                           coordinator_->GetUMATimeCallback(
-                               "NaCl.Perf.PNaClLoadTime.LoadLinker",
-                               NaClGetTimeOfDayMicroseconds() - ld_start_time),
-                           PP_OK);
   }
 
   int64_t link_start_time = NaClGetTimeOfDayMicroseconds();
   // Run LD.
   bool success = ld_subprocess_->InvokeSrpcMethod(
       "RunWithSplit",
       "ihhhhhhhhhhhhhhhhh",
       &params,
       static_cast<int>(obj_files_->size()),
       ld_in_files[0]->desc(),
@@ skipping 74 matching lines @@
   AbortSubprocesses();
   if (translate_thread_ != NULL)
     NaClThreadJoin(translate_thread_.get());
   PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
   NaClCondVarDtor(&buffer_cond_);
   NaClMutexDtor(&cond_mu_);
   NaClMutexDtor(&subprocess_mu_);
 }
 
 } // namespace plugin