| 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/logging.h" | 8 #include "base/logging.h" |
| 8 #include "base/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
| 9 #include "base/process/kill.h" | 10 #include "base/process/kill.h" |
| 10 #include "base/win/windows_version.h" | 11 #include "base/win/windows_version.h" |
| 11 | 12 |
| 12 namespace { | 13 namespace { |
| 13 | 14 |
| 14 DWORD kBasicProcessAccess = | 15 DWORD kBasicProcessAccess = |
| 15 PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION | SYNCHRONIZE; | 16 PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION | SYNCHRONIZE; |
| 16 | 17 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 } | 136 } |
| 136 return result; | 137 return result; |
| 137 } | 138 } |
| 138 | 139 |
| 139 bool Process::WaitForExit(int* exit_code) { | 140 bool Process::WaitForExit(int* exit_code) { |
| 140 return WaitForExitWithTimeout(TimeDelta::FromMilliseconds(INFINITE), | 141 return WaitForExitWithTimeout(TimeDelta::FromMilliseconds(INFINITE), |
| 141 exit_code); | 142 exit_code); |
| 142 } | 143 } |
| 143 | 144 |
| 144 bool Process::WaitForExitWithTimeout(TimeDelta timeout, int* exit_code) { | 145 bool Process::WaitForExitWithTimeout(TimeDelta timeout, int* exit_code) { |
| 146 // Record the event that this thread is blocking upon (for hang diagnosis). |
| 147 base::debug::ScopedProcessWaitActivity process_activity(this); |
| 148 |
| 145 // Limit timeout to INFINITE. | 149 // Limit timeout to INFINITE. |
| 146 DWORD timeout_ms = saturated_cast<DWORD>(timeout.InMilliseconds()); | 150 DWORD timeout_ms = saturated_cast<DWORD>(timeout.InMilliseconds()); |
| 147 if (::WaitForSingleObject(Handle(), timeout_ms) != WAIT_OBJECT_0) | 151 if (::WaitForSingleObject(Handle(), timeout_ms) != WAIT_OBJECT_0) |
| 148 return false; | 152 return false; |
| 149 | 153 |
| 150 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. |
| 151 if (!::GetExitCodeProcess(Handle(), &temp_code)) | 155 if (!::GetExitCodeProcess(Handle(), &temp_code)) |
| 152 return false; | 156 return false; |
| 153 | 157 |
| 154 if (exit_code) | 158 if (exit_code) |
| (...skipping 25 matching lines...) Expand all Loading... |
| 180 | 184 |
| 181 return (::SetPriorityClass(Handle(), priority) != 0); | 185 return (::SetPriorityClass(Handle(), priority) != 0); |
| 182 } | 186 } |
| 183 | 187 |
| 184 int Process::GetPriority() const { | 188 int Process::GetPriority() const { |
| 185 DCHECK(IsValid()); | 189 DCHECK(IsValid()); |
| 186 return ::GetPriorityClass(Handle()); | 190 return ::GetPriorityClass(Handle()); |
| 187 } | 191 } |
| 188 | 192 |
| 189 } // namespace base | 193 } // namespace base |
| OLD | NEW |