Better handling of surfaway/reload in PNaCl translation

ppapi/native_client/src/trusted/plugin/pnacl_streaming_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 "native_client/src/trusted/plugin/pnacl_streaming_translate_thread.h"
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/pnacl_resources.h"
 #include "native_client/src/trusted/plugin/srpc_params.h"
 #include "native_client/src/trusted/plugin/temporary_file.h"
 
 namespace plugin {
 
 PnaclStreamingTranslateThread::PnaclStreamingTranslateThread() : done_(false) {
   NaClXMutexCtor(&cond_mu_);
   NaClXCondVarCtor(&buffer_cond_);
 }
 
-PnaclStreamingTranslateThread::~PnaclStreamingTranslateThread() {}
+PnaclStreamingTranslateThread::~PnaclStreamingTranslateThread() {
+  PLUGIN_PRINTF(("~PnaclTranslateThread (translate_thread=%p)\n", this));
+  SetSubprocessesShouldDie();
+  NaClThreadJoin(translate_thread_.get());
+  PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
+}
 
 void PnaclStreamingTranslateThread::RunTranslate(
     const pp::CompletionCallback& finish_callback,
     const Manifest* manifest,
     const Manifest* ld_manifest,
     TempFile* obj_file,
     LocalTempFile* nexe_file,
     ErrorInfo* error_info,
     PnaclResources* resources,
     Plugin* plugin) {
@@ skipping 65 matching lines @@
     TranslateFailed("Compile process could not be created: " +
                     error_info.message());
     return;
   }
   // Run LLC.
   SrpcParams params;
   nacl::DescWrapper* llc_out_file = obj_file_->get_wrapper();
   PluginReverseInterface* llc_reverse =
       llc_subprocess->service_runtime()->rev_interface();
   llc_reverse->AddTempQuotaManagedFile(obj_file_->identifier());
+  RegisterReverseInterface(llc_reverse);
 
   if (!llc_subprocess->InvokeSrpcMethod("StreamInit",
                                         "h",
                                         &params,
                                         llc_out_file->desc())) {
     // StreamInit returns an error message if the RPC fails.
     TranslateFailed(nacl::string("Stream init failed: ") +
                     nacl::string(params.outs()[0]->arrays.str));
     return;
   }
@@ skipping 19 matching lines @@
                                             &params,
                                             &data[0],
                                             data.size())) {
         TranslateFailed("Compile stream chunk failed.");
         return;
       }
       PLUGIN_PRINTF(("StreamChunk Successful\n"));
     } else {
       NaClXMutexUnlock(&cond_mu_);
     }
+    if (SubprocessesShouldDie()) {
+      TranslateFailed("Stopped by coordinator.");
+      return;
+    }
   }
   PLUGIN_PRINTF(("PnaclTranslateThread done with chunks\n"));
   // Finish llc.
   if(!llc_subprocess->InvokeSrpcMethod("StreamEnd",
                                        "",
                                        &params)) {
     PLUGIN_PRINTF(("PnaclTranslateThread StreamEnd failed\n"));
     TranslateFailed(params.outs()[3]->arrays.str);
     return;
   }
   // LLC returns values that are used to determine how linking is done.
   int is_shared_library = (params.outs()[0]->u.ival != 0);
   nacl::string soname = params.outs()[1]->arrays.str;
   nacl::string lib_dependencies = params.outs()[2]->arrays.str;
   PLUGIN_PRINTF(("PnaclCoordinator: compile (translator=%p) succeeded"
                  " is_shared_library=%d, soname='%s', lib_dependencies='%s')\n",
                  this, is_shared_library, soname.c_str(),
                  lib_dependencies.c_str()));
 
   // Shut down the llc subprocess.
+  RegisterReverseInterface(NULL);
   llc_subprocess.reset(NULL);
   if (SubprocessesShouldDie()) {
     TranslateFailed("stopped by coordinator.");
     return;
   }
 
   if(!RunLdSubprocess(is_shared_library, soname, lib_dependencies)) {
     return;
   }
   pp::Core* core = pp::Module::Get()->core();
   core->CallOnMainThread(0, report_translate_finished_, PP_OK);
 }
 
 void PnaclStreamingTranslateThread::SetSubprocessesShouldDie() {
   PnaclTranslateThread::SetSubprocessesShouldDie();
   nacl::MutexLocker ml(&cond_mu_);
   done_ = true;
   NaClXCondVarSignal(&buffer_cond_);
 }
 
 } // namespace plugin