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

Side by Side 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: Patch is now working. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/child_thread.h" 5 #include "content/child/child_thread.h"
6 6
7 #include "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // the browser because "it's stuck") will leave behind a process eating all 68 // the browser because "it's stuck") will leave behind a process eating all
69 // the CPU. 69 // the CPU.
70 // 70 //
71 // So, we install a filter on the channel so that we can process this event 71 // So, we install a filter on the channel so that we can process this event
72 // here and kill the process. 72 // here and kill the process.
73 // 73 //
74 // We want to kill this process after giving it 30 seconds to run the exit 74 // We want to kill this process after giving it 30 seconds to run the exit
75 // handlers. SIGALRM has a default disposition of terminating the 75 // handlers. SIGALRM has a default disposition of terminating the
76 // application. 76 // application.
77 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChildCleanExit)) 77 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChildCleanExit))
78 alarm(30); 78 return;
79 else 79 else
80 _exit(0); 80 _exit(0);
81 } 81 }
82 82
83 protected: 83 protected:
84 virtual ~SuicideOnChannelErrorFilter() {} 84 virtual ~SuicideOnChannelErrorFilter() {}
85 }; 85 };
86 86
87 #endif // OS(POSIX) 87 #endif // OS(POSIX)
88 88
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 // inflight that would addref it. 388 // inflight that would addref it.
389 Send(new ChildProcessHostMsg_ShutdownRequest); 389 Send(new ChildProcessHostMsg_ShutdownRequest);
390 } 390 }
391 391
392 void ChildThread::EnsureConnected() { 392 void ChildThread::EnsureConnected() {
393 LOG(INFO) << "ChildThread::EnsureConnected()"; 393 LOG(INFO) << "ChildThread::EnsureConnected()";
394 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); 394 base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
395 } 395 }
396 396
397 } // namespace content 397 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698