Better handling of surfaway/reload in PNaCl translation

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.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 NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
+#include "native_client/src/trusted/plugin/service_runtime.h"
 
 #include "ppapi/cpp/completion_callback.h"
 
 namespace nacl {
 class DescWrapper;
 }
 
 
 namespace plugin {
 
@@ skipping 33 matching lines @@
   static void WINAPI DoTranslateThread(void* arg);
   // Runs the SRPCs that control translation. Called from the helper thread.
   virtual void DoTranslate() = 0;
   // Signal that Pnacl translation failed, from the translation thread only.
   void TranslateFailed(const nacl::string& error_string);
   // Run the LD subprocess, returning true on success
   bool RunLdSubprocess(int is_shared_library,
                        const nacl::string& soname,
                        const nacl::string& lib_dependencies);
 
+  // Register a reverse service interface which will be shutdown if the
+  // plugin is shutdown. The reverse service pointer  must be available on the
+  // main thread because the translation thread could be blocked on SRPC
+  // waiting for the translator, which could be waiting on a reverse
+  // service call.
+  void RegisterReverseInterface(PluginReverseInterface *interface);
+
   // Callback to run when tasks are completed or an error has occurred.
   pp::CompletionCallback report_translate_finished_;
   // True if the translation thread and related subprocesses should exit.
   bool subprocesses_should_die_;
   // Used to guard and publish subprocesses_should_die_.
   struct NaClMutex subprocess_mu_;
 
   nacl::scoped_ptr<NaClThread> translate_thread_;
 
+  // Reverse interface to shutdown on SetSubprocessesShouldDie
+  PluginReverseInterface *current_rev_interface_;

[robertm, 2012/07/31 17:22:18]

"*" to the left

[Derek Schuff, 2012/07/31 17:41:28]

Done.

+
   // Data about the translation files, owned by the coordinator
   const Manifest* manifest_;
   const Manifest* ld_manifest_;
   TempFile* obj_file_;
   LocalTempFile* nexe_file_;
   ErrorInfo* coordinator_error_info_;
   PnaclResources* resources_;
   Plugin* plugin_;
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread);
 };
 
 }
 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_