PNaCl: Hold subprocess_mu while doing StartSrpcServices.

components/nacl/renderer/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 "components/nacl/renderer/plugin/pnacl_translate_thread.h"
 
 #include <iterator>
 #include <sstream>
 
 #include "components/nacl/renderer/plugin/plugin.h"
@@ skipping 172 matching lines @@
   NaClXMutexUnlock(&cond_mu_);
 }
 
 void WINAPI PnaclTranslateThread::DoCompileThread(void* arg) {
   PnaclTranslateThread* translator =
       reinterpret_cast<PnaclTranslateThread*>(arg);
   translator->DoCompile();
 }
 
 void PnaclTranslateThread::DoCompile() {
-  // If the main thread asked us to exit in between starting the thread
-  // and now, just leave now.
   {
     nacl::MutexLocker ml(&subprocess_mu_);
+    // If the main thread asked us to exit in between starting the thread
+    // and now, just leave now.
     if (!compiler_subprocess_active_)
       return;
-  }
-
-  // Now that we are in helper thread, we can do the the blocking
-  // StartSrpcServices operation.
-  if (!compiler_subprocess_->StartSrpcServices()) {
-    TranslateFailed(
-        PP_NACL_ERROR_SRPC_CONNECTION_FAIL,
-        "SRPC connection failure for " + compiler_subprocess_->description());
-    return;
+    // Now that we are in helper thread, we can do the the blocking
+    // StartSrpcServices operation.
+    if (!compiler_subprocess_->StartSrpcServices()) {
+      TranslateFailed(
+          PP_NACL_ERROR_SRPC_CONNECTION_FAIL,
+          "SRPC connection failure for " + compiler_subprocess_->description());
+      return;
+    }
   }
 
   SrpcParams params;
   std::vector<nacl::DescWrapper*> compile_out_files;
   size_t i;
   for (i = 0; i < obj_files_->size(); i++)
     compile_out_files.push_back((*obj_files_)[i]->write_wrapper());
   for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     compile_out_files.push_back(invalid_desc_wrapper_);
 
@@ skipping 113 matching lines @@
   core->CallOnMainThread(0, compile_finished_callback_, PP_OK);
 }
 
 void WINAPI PnaclTranslateThread::DoLinkThread(void* arg) {
   PnaclTranslateThread* translator =
       reinterpret_cast<PnaclTranslateThread*>(arg);
   translator->DoLink();
 }
 
 void PnaclTranslateThread::DoLink() {
-  // If the main thread asked us to exit in between starting the thread
-  // and now, just leave now.
   {
     nacl::MutexLocker ml(&subprocess_mu_);
+    // If the main thread asked us to exit in between starting the thread
+    // and now, just leave now.
     if (!ld_subprocess_active_)
       return;
-  }
-
-  // Now that we are in helper thread, we can do the the blocking
-  // StartSrpcServices operation.
-  if (!ld_subprocess_->StartSrpcServices()) {
-    TranslateFailed(
-        PP_NACL_ERROR_SRPC_CONNECTION_FAIL,
-        "SRPC connection failure for " + ld_subprocess_->description());
-    return;
+    // Now that we are in helper thread, we can do the the blocking
+    // StartSrpcServices operation.
+    if (!ld_subprocess_->StartSrpcServices()) {
+      TranslateFailed(
+          PP_NACL_ERROR_SRPC_CONNECTION_FAIL,
+          "SRPC connection failure for " + ld_subprocess_->description());
+      return;
+    }
   }
 
   SrpcParams params;
   std::vector<nacl::DescWrapper*> ld_in_files;
   size_t i;
   for (i = 0; i < obj_files_->size(); i++) {
     // Reset object file for reading first.
     if (!(*obj_files_)[i]->Reset()) {
       TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
                       "Link process could not reset object file");
@@ skipping 92 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