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

Side by Side Diff: chrome/common/process_watcher_posix.cc

Issue 115773: Prototype implementation of zygotes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « chrome/common/ipc_channel_posix.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/common/process_watcher.h" 5 #include "chrome/common/process_watcher.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <sys/wait.h> 10 #include <sys/wait.h>
11 11
12 #include "base/eintr_wrapper.h" 12 #include "base/eintr_wrapper.h"
13 #include "base/platform_thread.h" 13 #include "base/platform_thread.h"
14 #include "base/zygote_manager.h"
14 15
15 // Return true if the given child is dead. This will also reap the process. 16 // Return true if the given child is dead. This will also reap the process.
16 // Doesn't block. 17 // Doesn't block.
17 static bool IsChildDead(pid_t child) { 18 static bool IsChildDead(pid_t child) {
18 const int result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG)); 19 const int result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG));
19 if (result == -1) { 20 if (result == -1) {
20 NOTREACHED(); 21 NOTREACHED();
21 } else if (result > 0) { 22 } else if (result > 0) {
22 // The child has died. 23 // The child has died.
23 return true; 24 return true;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 63
63 private: 64 private:
64 const pid_t child_; 65 const pid_t child_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(BackgroundReaper); 67 DISALLOW_COPY_AND_ASSIGN(BackgroundReaper);
67 }; 68 };
68 69
69 // static 70 // static
70 void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) { 71 void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) {
71 // If the child is already dead, then there's nothing to do 72 // If the child is already dead, then there's nothing to do
72 if (IsChildDead(process)) 73 const int result = HANDLE_EINTR(waitpid(process, NULL, WNOHANG));
74 if (result > 0)
73 return; 75 return;
76 if (result == -1) {
77 #if defined(OS_LINUX)
78 // If it wasn't our child, maybe it was the zygote manager's child
79 base::ZygoteManager* zm = base::ZygoteManager::Get();
80 if (zm) {
81 zm->EnsureProcessTerminated(process);
82 return;
83 }
84 #endif // defined(OS_LINUX)
85 NOTREACHED();
86 }
74 87
75 BackgroundReaper* reaper = new BackgroundReaper(process); 88 BackgroundReaper* reaper = new BackgroundReaper(process);
76 PlatformThread::CreateNonJoinable(0, reaper); 89 PlatformThread::CreateNonJoinable(0, reaper);
77 } 90 }
OLDNEW
« no previous file with comments | « chrome/common/ipc_channel_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698