Pepper: TempFile cleanup.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.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_COORDINATOR_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_
 
 #include <set>
 #include <map>
 #include <vector>
@@ skipping 33 matching lines @@
 //     Other values indicate errors.
 // (3) After finish_callback runs, get the file descriptor of the translated
 //     nexe, e.g.,
 //     fd = coord->ReleaseTranslatedFD();
 // (4) Load the nexe from "fd".
 // (5) delete coord.
 //
 // Translation proceeds in two steps:
 // (1) llc translates the bitcode in pexe_url_ to an object in obj_file_.
 // (2) ld links the object code in obj_file_ and produces a nexe in nexe_file_.
-//
-// The coordinator proceeds through several states.  They are
-// OPEN_BITCODE_STREAM
-//       Complete when BitcodeStreamDidOpen is invoked
-// LOAD_TRANSLATOR_BINARIES
-//     Complete when ResourcesDidLoad is invoked.
-// GET_NEXE_FD
-//       Get an FD which contains the cached nexe, or is writeable for
-//       translation output. Complete when NexeFdDidOpen is called.
-//
-// If there was a cache hit, go to OPEN_NEXE_FOR_SEL_LDR, otherwise,
-// continue streaming the bitcode, and:
-// OPEN_TMP_FOR_LLC_TO_LD_COMMUNICATION
-//     Complete when ObjectFileDidOpen is invoked.
-// OPEN_NEXE_FD_FOR_WRITING
-//     Complete when RunTranslate is invoked.
-// START_LD_AND_LLC_SUBPROCESS_AND_INITIATE_TRANSLATION
-//     Complete when RunTranslate returns.
-// TRANSLATION_COMPLETE
-//     Complete when TranslateFinished is invoked.
-//
-// OPEN_NEXE_FOR_SEL_LDR
-//   Complete when NexeReadDidOpen is invoked.
 class PnaclCoordinator: public CallbackSource<FileStreamData> {
  public:
   // Maximum number of object files passable to the translator. Cannot be
   // changed without changing the RPC signatures.
   const static size_t kMaxTranslatorObjectFiles = 16;
   virtual ~PnaclCoordinator();
 
   // The factory method for translations.
   static PnaclCoordinator* BitcodeToNative(
       Plugin* plugin,
       const nacl::string& pexe_url,
       const PP_PNaClOptions& pnacl_options,
       const pp::CompletionCallback& translate_notify_callback);
 
   // Call this to take ownership of the FD of the translated nexe after
   // BitcodeToNative has completed (and the finish_callback called).
-  nacl::DescWrapper* ReleaseTranslatedFD();
+  PP_FileHandle TakeTranslatedFileHandle();
 
   // Run |translate_notify_callback_| with an error condition that is not
   // PPAPI specific.  Also set ErrorInfo report.
   void ReportNonPpapiError(PP_NaClError err, const nacl::string& message);
   // Run when faced with a PPAPI error condition. Bring control back to the
   // plugin by invoking the |translate_notify_callback_|.
   // Also set ErrorInfo report.
   void ReportPpapiError(PP_NaClError err,
                         int32_t pp_error, const nacl::string& message);
   // Bring control back to the plugin by invoking the
@@ skipping 55 matching lines @@
   void ResourcesDidLoad(int32_t pp_error);
   // Invoked when we've gotten a temp FD for the nexe, either with the nexe
   // data, or a writeable fd to save to.
   void NexeFdDidOpen(int32_t pp_error);
   // Invoked when a pexe data chunk arrives (when using streaming translation)
   void BitcodeStreamGotData(int32_t pp_error, FileStreamData data);
   // Invoked when a pexe data chunk is compiled.
   void BitcodeGotCompiled(int32_t pp_error, int64_t bytes_compiled);
   // Invoked when the pexe download finishes (using streaming translation)
   void BitcodeStreamDidFinish(int32_t pp_error);
-  // Invoked when the write descriptor for obj_file_ is created.
-  void ObjectFileDidOpen(int32_t pp_error);
   // Once llc and ld nexes have been loaded and the two temporary files have
   // been created, this starts the translation.  Translation starts two
   // subprocesses, one for llc and one for ld.
   void RunTranslate(int32_t pp_error);
 
   // Invoked when translation is finished.
   void TranslateFinished(int32_t pp_error);
 
   // Invoked when the read descriptor for nexe_file_ is created.
   void NexeReadDidOpen(int32_t pp_error);
@@ skipping 67 matching lines @@
   // The helper thread used to do translations via SRPC.
   // It accesses fields of PnaclCoordinator so it must have a
   // shorter lifetime.
   nacl::scoped_ptr<PnaclTranslateThread> translate_thread_;
 };
 
 //----------------------------------------------------------------------
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_