summaryrefslogtreecommitdiffstats
path: root/chrome/common/process_watcher_mac.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 16:53:56 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 16:53:56 +0000
commit71c311bb926357af4adea1eb4206c3455be69c29 (patch)
tree66a7ab2c7767d1060e5e8fe5e4e33885651c3708 /chrome/common/process_watcher_mac.cc
parentc08503001980b9f5f913ab9f83542fcab7e38a66 (diff)
downloadchromium_src-71c311bb926357af4adea1eb4206c3455be69c29.zip
chromium_src-71c311bb926357af4adea1eb4206c3455be69c29.tar.gz
chromium_src-71c311bb926357af4adea1eb4206c3455be69c29.tar.bz2
Mac: ensure child processes are properly reaped -- eliminate Helper zombies.
BUG=32001 TEST=Surf a lot. Then close all Chrome/Chromium windows. Make sure there aren't any zombie Chrome/Chromium Helper processes (run "ps -Al" and look for things with status containing 'Z'). Review URL: http://codereview.chromium.org/542042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/process_watcher_mac.cc')
-rw-r--r--chrome/common/process_watcher_mac.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/process_watcher_mac.cc b/chrome/common/process_watcher_mac.cc
index 2d5d185..be5b9f7 100644
--- a/chrome/common/process_watcher_mac.cc
+++ b/chrome/common/process_watcher_mac.cc
@@ -42,7 +42,9 @@ void WaitForChildToDie(pid_t child, unsigned timeout) {
int result = HANDLE_EINTR(kevent(kq, &event_to_add, 1, NULL, 0, NULL));
if (result == -1 && errno == ESRCH) {
// A "No Such Process" error is fine, the process may have died already
- // and been reaped by someone else.
+ // and been reaped by someone else. But make sure that it was/is reaped.
+ // Don't report an error in case it was already reaped.
+ HANDLE_EINTR(waitpid(child, NULL, WNOHANG));
return;
}