| OLD | NEW |
| 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 "base/process/process.h" | 5 #include "base/process/process.h" |
| 6 | 6 |
| 7 #include "base/debug/activity_tracker.h" | 7 #include "base/debug/activity_tracker.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
| 10 #include "base/process/kill.h" | 10 #include "base/process/kill.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 if (result && wait) { | 130 if (result && wait) { |
| 131 // The process may not end immediately due to pending I/O | 131 // The process may not end immediately due to pending I/O |
| 132 if (::WaitForSingleObject(Handle(), 60 * 1000) != WAIT_OBJECT_0) | 132 if (::WaitForSingleObject(Handle(), 60 * 1000) != WAIT_OBJECT_0) |
| 133 DPLOG(ERROR) << "Error waiting for process exit"; | 133 DPLOG(ERROR) << "Error waiting for process exit"; |
| 134 } else if (!result) { | 134 } else if (!result) { |
| 135 DPLOG(ERROR) << "Unable to terminate process"; | 135 DPLOG(ERROR) << "Unable to terminate process"; |
| 136 } | 136 } |
| 137 return result; | 137 return result; |
| 138 } | 138 } |
| 139 | 139 |
| 140 bool Process::WaitForExit(int* exit_code) { | 140 bool Process::WaitForExit(int* exit_code) const { |
| 141 return WaitForExitWithTimeout(TimeDelta::FromMilliseconds(INFINITE), | 141 return WaitForExitWithTimeout(TimeDelta::FromMilliseconds(INFINITE), |
| 142 exit_code); | 142 exit_code); |
| 143 } | 143 } |
| 144 | 144 |
| 145 bool Process::WaitForExitWithTimeout(TimeDelta timeout, int* exit_code) { | 145 bool Process::WaitForExitWithTimeout(TimeDelta timeout, int* exit_code) const { |
| 146 // Record the event that this thread is blocking upon (for hang diagnosis). | 146 // Record the event that this thread is blocking upon (for hang diagnosis). |
| 147 base::debug::ScopedProcessWaitActivity process_activity(this); | 147 base::debug::ScopedProcessWaitActivity process_activity(this); |
| 148 | 148 |
| 149 // Limit timeout to INFINITE. | 149 // Limit timeout to INFINITE. |
| 150 DWORD timeout_ms = saturated_cast<DWORD>(timeout.InMilliseconds()); | 150 DWORD timeout_ms = saturated_cast<DWORD>(timeout.InMilliseconds()); |
| 151 if (::WaitForSingleObject(Handle(), timeout_ms) != WAIT_OBJECT_0) | 151 if (::WaitForSingleObject(Handle(), timeout_ms) != WAIT_OBJECT_0) |
| 152 return false; | 152 return false; |
| 153 | 153 |
| 154 DWORD temp_code; // Don't clobber out-parameters in case of failure. | 154 DWORD temp_code; // Don't clobber out-parameters in case of failure. |
| 155 if (!::GetExitCodeProcess(Handle(), &temp_code)) | 155 if (!::GetExitCodeProcess(Handle(), &temp_code)) |
| (...skipping 28 matching lines...) Expand all Loading... |
| 184 | 184 |
| 185 return (::SetPriorityClass(Handle(), priority) != 0); | 185 return (::SetPriorityClass(Handle(), priority) != 0); |
| 186 } | 186 } |
| 187 | 187 |
| 188 int Process::GetPriority() const { | 188 int Process::GetPriority() const { |
| 189 DCHECK(IsValid()); | 189 DCHECK(IsValid()); |
| 190 return ::GetPriorityClass(Handle()); | 190 return ::GetPriorityClass(Handle()); |
| 191 } | 191 } |
| 192 | 192 |
| 193 } // namespace base | 193 } // namespace base |
| OLD | NEW |