Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2777)

Unified Diff: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

Issue 10830149: Kill pnacl translation processes immediately on coordinator error and destruction (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
index 3f8d25829e717f52f2181def6d554c3ea5fc0d66..790e0219f33fa3b884411a9e753bdcb59f94dc13 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
@@ -251,7 +251,7 @@ PnaclCoordinator::~PnaclCoordinator() {
// will have been destroyed. This will result in the cancellation of
// translation_complete_callback_, so no notification will be delivered.
if (translate_thread_.get() != NULL) {
- translate_thread_->SetSubprocessesShouldDie();
+ translate_thread_->AbortSubprocesses();
}
}
@@ -444,10 +444,8 @@ void PnaclCoordinator::CachedFileDidOpen(int32_t pp_error) {
ReportNonPpapiError("could not allocate translation thread.");
return;
}
- // In the streaming case we also want to open the object file now so the
+ // 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 TempFile(plugin_));
pp::CompletionCallback obj_cb =
callback_factory_.NewCallback(&PnaclCoordinator::ObjectFileDidOpen);
@@ -475,7 +473,7 @@ void PnaclCoordinator::BitcodeStreamDidFinish(int32_t pp_error) {
translate_finish_error_ = pp_error;
error_info_.SetReport(ERROR_UNKNOWN,
nacl::string("PnaclCoordinator: pexe load failed."));
- translate_thread_->SetSubprocessesShouldDie();
+ translate_thread_->AbortSubprocesses();
}
}
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698