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

Unified Diff: content/child/child_thread.cc

Issue 19231006: chrome: respect --child-clean-exit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Made comments better. Created 7 years, 5 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 | « content/browser/zygote_host/zygote_host_impl_linux.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_thread.cc
diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
index f5061bfe16c5432c278bcd7bc0b3f0d4a751b52b..6eba0c83ede89f9208f3c9a259fa1c2d79e1b3f4 100644
--- a/content/child/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -75,7 +75,11 @@ class SuicideOnChannelErrorFilter : public IPC::ChannelProxy::MessageFilter {
// handlers. SIGALRM has a default disposition of terminating the
// application.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChildCleanExit))
- alarm(30);
+ // FIXME(asharif): This is wrong code. We cannot call exit() in a
+ // multi-threaded environment. However, simply having a return statement
+ // here causes a deadlock or abort because of the same thread tries to
+ // acquire the same lock twice. See: crbug.com/263594
+ exit(0);
else
_exit(0);
}
« no previous file with comments | « content/browser/zygote_host/zygote_host_impl_linux.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698