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

Side by Side Diff: content/browser/child_process_launcher.cc

Issue 7054080: Add a flag to print the handles held by a child process when it shuts down. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/child_process_launcher.h" 5 #include "content/browser/child_process_launcher.h"
6 6
7 #include <utility> // For std::pair. 7 #include <utility> // For std::pair.
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "content/browser/browser_thread.h" 14 #include "content/browser/browser_thread.h"
15 #include "content/browser/content_browser_client.h" 15 #include "content/browser/content_browser_client.h"
16 #include "content/common/chrome_descriptors.h" 16 #include "content/common/chrome_descriptors.h"
17 #include "content/common/content_switches.h" 17 #include "content/common/content_switches.h"
18 #include "content/common/process_watcher.h" 18 #include "content/common/process_watcher.h"
19 #include "content/common/result_codes.h" 19 #include "content/common/result_codes.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "base/file_path.h" 22 #include "base/file_path.h"
23 #include "chrome/common/chrome_switches.h"
jam 2011/06/08 22:06:38 nit: don't add this to chrome_switches if it's use
Cris Neckar 2011/06/09 18:20:13 Done.
24 #include "content/browser/handle_enumerator_win.h"
23 #include "content/common/sandbox_policy.h" 25 #include "content/common/sandbox_policy.h"
24 #elif defined(OS_MACOSX) 26 #elif defined(OS_MACOSX)
25 #include "chrome/browser/mach_broker_mac.h" 27 #include "chrome/browser/mach_broker_mac.h"
26 #elif defined(OS_POSIX) 28 #elif defined(OS_POSIX)
27 #include "base/memory/singleton.h" 29 #include "base/memory/singleton.h"
28 #include "content/browser/zygote_host_linux.h" 30 #include "content/browser/zygote_host_linux.h"
29 #include "content/browser/renderer_host/render_sandbox_host_linux.h" 31 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
30 #endif 32 #endif
31 33
32 #if defined(OS_POSIX) 34 #if defined(OS_POSIX)
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 } 211 }
210 } 212 }
211 213
212 void Terminate() { 214 void Terminate() {
213 if (!process_.handle()) 215 if (!process_.handle())
214 return; 216 return;
215 217
216 if (!terminate_child_on_shutdown_) 218 if (!terminate_child_on_shutdown_)
217 return; 219 return;
218 220
221 #if defined(OS_WIN)
222 const CommandLine& browser_command_line =
223 *CommandLine::ForCurrentProcess();
224 if (browser_command_line.HasSwitch(switches::kAuditHandles) ||
225 browser_command_line.HasSwitch(switches::kAuditAllHandles)) {
226 scoped_refptr<HandleEnumerator> handle_enum(
227 new HandleEnumerator(process_.handle(),
228 browser_command_line.HasSwitch(switches::kAuditAllHandles)));
229 handle_enum->RunHandleEnumeration();
230 process_.set_handle(base::kNullProcessHandle);
231 return;
232 }
233 #endif
234
219 // On Posix, EnsureProcessTerminated can lead to 2 seconds of sleep! So 235 // On Posix, EnsureProcessTerminated can lead to 2 seconds of sleep! So
220 // don't this on the UI/IO threads. 236 // don't this on the UI/IO threads.
221 BrowserThread::PostTask( 237 BrowserThread::PostTask(
222 BrowserThread::PROCESS_LAUNCHER, FROM_HERE, 238 BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
223 NewRunnableFunction( 239 NewRunnableFunction(
224 &ChildProcessLauncher::Context::TerminateInternal, 240 &ChildProcessLauncher::Context::TerminateInternal,
225 #if defined(OS_POSIX) && !defined(OS_MACOSX) 241 #if defined(OS_POSIX) && !defined(OS_MACOSX)
226 zygote_, 242 zygote_,
227 #endif 243 #endif
228 process_.handle())); 244 process_.handle()));
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 &ChildProcessLauncher::Context::SetProcessBackgrounded, 369 &ChildProcessLauncher::Context::SetProcessBackgrounded,
354 background)); 370 background));
355 } 371 }
356 372
357 void ChildProcessLauncher::SetTerminateChildOnShutdown( 373 void ChildProcessLauncher::SetTerminateChildOnShutdown(
358 bool terminate_on_shutdown) { 374 bool terminate_on_shutdown) {
359 if (context_) 375 if (context_)
360 context_->set_terminate_child_on_shutdown(terminate_on_shutdown); 376 context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
361 } 377 }
362 378
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698