Remove non-streaming translation code from pnacl coordinator

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.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_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
@@ skipping 221 matching lines @@
     translate_notify_callback_(translate_notify_callback),
     file_system_(new pp::FileSystem(plugin, PP_FILESYSTEMTYPE_LOCALTEMPORARY)),
     manifest_(new ExtensionManifest(plugin->url_util())),
     pexe_url_(pexe_url),
     cache_identity_(cache_identity),
     error_already_reported_(false) {
   PLUGIN_PRINTF(("PnaclCoordinator::PnaclCoordinator (this=%p, plugin=%p)\n",
                  static_cast<void*>(this), static_cast<void*>(plugin)));
   callback_factory_.Initialize(this);
   ld_manifest_.reset(new PnaclLDManifest(plugin_->manifest(), manifest_.get()));
-  // TODO(dschuff): stream ALL the translations!
-  do_streaming_translation_ = (getenv("NACL_STREAMING_TRANSLATION") != NULL);
 }
 
 PnaclCoordinator::~PnaclCoordinator() {
   PLUGIN_PRINTF(("PnaclCoordinator::~PnaclCoordinator (this=%p, "
                  "translate_thread=%p\n",
                  static_cast<void*>(this), translate_thread_.get()));
   // Stopping the translate thread will cause the translate thread to try to
   // run translation_complete_callback_ on the main thread.  This destructor is
   // running from the main thread, and by the time it exits, callback_factory_
   // will have been destroyed.  This will result in the cancellation of
@@ skipping 202 matching lines @@
   }
 }
 
 void PnaclCoordinator::CachedFileDidOpen(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::CachedFileDidOpen (pp_error=%"
                  NACL_PRId32")\n", pp_error));
   if (pp_error == PP_OK) {
     NexeReadDidOpen(PP_OK);
     return;
   }
-  if (do_streaming_translation_) {
-    // Create the translation thread object immediately. This ensures that any
-    // pieces of the file that get downloaded before the compilation thread
-    // is accepting SRPCs won't get dropped.
-    translate_thread_.reset(new PnaclStreamingTranslateThread());
-    if (translate_thread_ == NULL) {
-      ReportNonPpapiError("could not allocate translation thread.");
-      return;
-    }
-    // In the streaming case we also want to open the object file now so the
-    // translator can start writing to it during streaming translation.
-    // In the non-streaming case this can wait until the bitcode download is
-    // finished.
-    obj_file_.reset(new LocalTempFile(plugin_, file_system_.get(),
+
+  // Create the translation thread object immediately. This ensures that any
+  // pieces of the file that get downloaded before the compilation thread
+  // is accepting SRPCs won't get dropped.
+  translate_thread_.reset(new PnaclStreamingTranslateThread());
+  if (translate_thread_ == NULL) {
+    ReportNonPpapiError("could not allocate translation thread.");
+    return;
+  }
+  // In the streaming case we also want to open the object file now so the
+  // translator can start writing to it during streaming translation.
+  // In the non-streaming case this can wait until the bitcode download is
+  // finished.
+  obj_file_.reset(new LocalTempFile(plugin_, file_system_.get(),
                                     nacl::string(kPnaclTempDir)));
-    pp::CompletionCallback obj_cb =
+  pp::CompletionCallback obj_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ObjectWriteDidOpen);
-    obj_file_->OpenWrite(obj_cb);
+  obj_file_->OpenWrite(obj_cb);
 
-    streaming_downloader_.reset(new FileDownloader());
-    streaming_downloader_->Initialize(plugin_);
-    pp::CompletionCallback cb =
-        callback_factory_.NewCallback(
-            &PnaclCoordinator::BitcodeStreamDidFinish);
+  streaming_downloader_.reset(new FileDownloader());
+  streaming_downloader_->Initialize(plugin_);
+  pp::CompletionCallback cb =
+      callback_factory_.NewCallback(
+          &PnaclCoordinator::BitcodeStreamDidFinish);
 
-    // TODO(dschuff): need to use url_util_->ResolveRelativeToURL?
-    if (!streaming_downloader_->OpenStream(pexe_url_, cb, this)) {
-        ReportNonPpapiError(nacl::string("failed to open stream ") + pexe_url_);
-    }
-
-  } else {
-    translate_thread_.reset(new PnaclTranslateThread());
-    if (translate_thread_ == NULL) {
-      ReportNonPpapiError("could not allocate translation thread.");
-      return;
-    }
-    // load the pexe and set up temp files for translation.
-    pp::CompletionCallback cb =
-        callback_factory_.NewCallback(&PnaclCoordinator::BitcodeFileDidOpen);
-    if (!plugin_->StreamAsFile(pexe_url_, cb.pp_completion_callback())) {
-      ReportNonPpapiError(nacl::string("failed to download ") + pexe_url_+ ".");
-    }
+  // TODO(dschuff): need to use url_util_->ResolveRelativeToURL?
+  if (!streaming_downloader_->OpenStream(pexe_url_, cb, this)) {
+    ReportNonPpapiError(nacl::string("failed to open stream ") + pexe_url_);
   }
 }
 
 void PnaclCoordinator::BitcodeStreamDidFinish(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::BitcodeStreamDidFinish (pp_error=%"
                  NACL_PRId32")\n", pp_error));
   if (pp_error != PP_OK) {
     // Defer reporting the error and obj_file/nexe_file cleanup until after
     // the translation thread returns, because it may be accessing the
     // coordinator's objects or writing to the files.
@@ skipping 12 matching lines @@
     static_cast<PnaclStreamingTranslateThread*>(translate_thread_.get());
   DCHECK(thread);
   thread->PutBytes(data, pp_error);
 }
 
 StreamCallback PnaclCoordinator::GetCallback() {
   return callback_factory_.NewCallbackWithOutput(
       &PnaclCoordinator::BitcodeStreamGotData);
 }
 
-void PnaclCoordinator::BitcodeFileDidOpen(int32_t pp_error) {
-  PLUGIN_PRINTF(("PnaclCoordinator::BitcodeFileDidOpen (pp_error=%"
-                 NACL_PRId32")\n", pp_error));
-  // We have to get the fd immediately after streaming, otherwise it
-  // seems like the temp file will get GC'ed.
-  int32_t fd = GetLoadedFileDesc(pp_error, pexe_url_, "pexe");
-  if (fd < 0) {
-    // Error already reported by GetLoadedFileDesc().
-    return;
-  }
-  pexe_wrapper_.reset(plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY));
-
-  obj_file_.reset(new LocalTempFile(plugin_, file_system_.get(),
-                                    nacl::string(kPnaclTempDir)));
-  pp::CompletionCallback cb =
-      callback_factory_.NewCallback(&PnaclCoordinator::ObjectWriteDidOpen);
-  obj_file_->OpenWrite(cb);
-}
-
 void PnaclCoordinator::ObjectWriteDidOpen(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::ObjectWriteDidOpen (pp_error=%"
                  NACL_PRId32")\n", pp_error));
   if (pp_error != PP_OK) {
     ReportPpapiError(pp_error);
     return;
   }
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ObjectReadDidOpen);
   obj_file_->OpenRead(cb);
@@ skipping 29 matching lines @@
                                   ld_manifest_.get(),
                                   obj_file_.get(),
                                   nexe_file_.get(),
                                   pexe_wrapper_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   plugin_);
 }
 
 }  // namespace plugin