OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/process/kill.h" | 5 #include "base/process/kill.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <sys/event.h> | 8 #include <sys/event.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 #include <sys/wait.h> | 10 #include <sys/wait.h> |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 DPLOG(ERROR) << "kill(" << child << ", SIGKILL)"; | 158 DPLOG(ERROR) << "kill(" << child << ", SIGKILL)"; |
159 } else { | 159 } else { |
160 // The child is definitely on the way out now. BlockingReap won't need to | 160 // The child is definitely on the way out now. BlockingReap won't need to |
161 // wait for long, if at all. | 161 // wait for long, if at all. |
162 BlockingReap(child); | 162 BlockingReap(child); |
163 } | 163 } |
164 } | 164 } |
165 | 165 |
166 } // namespace | 166 } // namespace |
167 | 167 |
168 void EnsureProcessTerminated(ProcessHandle process) { | 168 void EnsureProcessTerminated(Process process) { |
169 WaitForChildToDie(process, kWaitBeforeKillSeconds); | 169 WaitForChildToDie(process.pid(), kWaitBeforeKillSeconds); |
170 } | 170 } |
171 | 171 |
172 } // namespace base | 172 } // namespace base |
OLD | NEW |