Pepper: DescWrapper cleanup in PnaclResources.

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 128 matching lines @@
   data_buffers_.push_back(std::vector<char>());
   bytes->swap(data_buffers_.back()); // Avoid copying the buffer data.
 
   NaClXCondVarSignal(&buffer_cond_);
   NaClXMutexUnlock(&cond_mu_);
 
   // Ensure the buffer we send back to the coordinator is the expected size
   bytes->resize(buffer_size);
 }
 
-NaClSubprocess* PnaclTranslateThread::StartSubprocess(
-    const nacl::string& url_for_nexe,
-    int32_t manifest_id,
-    ErrorInfo* error_info) {
-  PLUGIN_PRINTF(("PnaclTranslateThread::StartSubprocess (url_for_nexe=%s)\n",
-                 url_for_nexe.c_str()));
-  nacl::DescWrapper* wrapper = resources_->WrapperForUrl(url_for_nexe);
-  // Supply a URL for the translator components, different from the app URL,
-  // so that NaCl GDB can filter-out the translator processes (and not debug
-  // the translator itself). Must have a full URL with schema, otherwise the
-  // string gets silently dropped by GURL.
-  nacl::string full_url = resources_->GetFullUrl(
-      url_for_nexe, plugin_->nacl_interface()->GetSandboxArch());
-  nacl::scoped_ptr<NaClSubprocess> subprocess(plugin_->LoadHelperNaClModule(
-      full_url, wrapper, manifest_id, error_info));
-  if (subprocess.get() == NULL) {
-    PLUGIN_PRINTF((
-        "PnaclTranslateThread::StartSubprocess: subprocess creation failed\n"));
-    return NULL;
-  }
-  return subprocess.release();
-}
-
 void WINAPI PnaclTranslateThread::DoTranslateThread(void* arg) {
   PnaclTranslateThread* translator =
       reinterpret_cast<PnaclTranslateThread*>(arg);
   translator->DoTranslate();
 }
 
 void PnaclTranslateThread::DoTranslate() {
   ErrorInfo error_info;
   SrpcParams params;
   std::vector<nacl::DescWrapper*> llc_out_files;
   size_t i;
-  for (i = 0; i < obj_files_->size(); i++) {
+  for (i = 0; i < obj_files_->size(); i++)
     llc_out_files.push_back((*obj_files_)[i]->write_wrapper());
-  }
-  for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++) {
+  for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     llc_out_files.push_back(invalid_desc_wrapper_);
-  }
 
   pp::Core* core = pp::Module::Get()->core();
   {
     nacl::MutexLocker ml(&subprocess_mu_);
     int64_t llc_start_time = NaClGetTimeOfDayMicroseconds();
-    llc_subprocess_.reset(
-      StartSubprocess(resources_->GetLlcUrl(), manifest_id_, &error_info));
-    if (llc_subprocess_ == NULL) {
+    PP_FileHandle llc_file_handle = resources_->TakeLlcFileHandle();
+
+    // On success, ownership of llc_file_handle is transferred.
+    llc_subprocess_.reset(plugin_->LoadHelperNaClModule(
+        resources_->GetLlcUrl(), llc_file_handle, manifest_id_, &error_info));
+    if (llc_subprocess_.get() == NULL) {
+      if (llc_file_handle != PP_kInvalidFileHandle)
+        CloseFileHandle(llc_file_handle);
       TranslateFailed(PP_NACL_ERROR_PNACL_LLC_SETUP,
                       "Compile process could not be created: " +
                       error_info.message());
       return;
     }
+
     llc_subprocess_active_ = true;
     core->CallOnMainThread(0,
                            coordinator_->GetUMATimeCallback(
                                "NaCl.Perf.PNaClLoadTime.LoadCompiler",
                                NaClGetTimeOfDayMicroseconds() - llc_start_time),
                            PP_OK);
     // Run LLC.
     PluginReverseInterface* llc_reverse =
         llc_subprocess_->service_runtime()->rev_interface();
     for (size_t i = 0; i < obj_files_->size(); i++) {
@@ skipping 134 matching lines @@
   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");
       return false;
     }
     ld_in_files.push_back((*obj_files_)[i]->read_wrapper());
   }
-  for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++) {
+  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();
   {
     // Create LD process
     nacl::MutexLocker ml(&subprocess_mu_);
     int64_t ld_start_time = NaClGetTimeOfDayMicroseconds();
-    ld_subprocess_.reset(
-      StartSubprocess(resources_->GetLdUrl(), manifest_id_, &error_info));
+    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, manifest_id_, &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());
       return false;
     }
     ld_subprocess_active_ = true;
     core->CallOnMainThread(0,
                            coordinator_->GetUMATimeCallback(
                                "NaCl.Perf.PNaClLoadTime.LoadLinker",
                                NaClGetTimeOfDayMicroseconds() - ld_start_time),
@@ skipping 87 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