summaryrefslogtreecommitdiffstats
path: root/base/process_util_win.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 17:23:51 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 17:23:51 +0000
commit743ace4213ae3ea93355dff8b57ef33287b32220 (patch)
treee39fc30e436e0a06790d665878cd91113ba180d4 /base/process_util_win.cc
parent8c14a436fe6488c8f647ff79301102e885838c77 (diff)
downloadchromium_src-743ace4213ae3ea93355dff8b57ef33287b32220.zip
chromium_src-743ace4213ae3ea93355dff8b57ef33287b32220.tar.gz
chromium_src-743ace4213ae3ea93355dff8b57ef33287b32220.tar.bz2
Consistently use int64 for integers holding number of milliseconds.
This applies only to things which use TimeDelta::InMilliseconds, because it returns int64. Before this patch callers static_casted that to int, and after this patch they use the returned value as int64. Review URL: http://codereview.chromium.org/126279 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_win.cc')
-rw-r--r--base/process_util_win.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 008cffa..aea8cb9 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -429,7 +429,7 @@ bool KillProcesses(const std::wstring& executable_name, int exit_code,
}
bool WaitForProcessesToExit(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
const ProcessFilter* filter) {
const ProcessEntry* entry;
bool result = true;
@@ -438,8 +438,7 @@ bool WaitForProcessesToExit(const std::wstring& executable_name,
NamedProcessIterator iter(executable_name, filter);
while (entry = iter.NextProcessEntry()) {
DWORD remaining_wait =
- std::max(0, wait_milliseconds -
- static_cast<int>(GetTickCount() - start_time));
+ std::max<int64>(0, wait_milliseconds - (GetTickCount() - start_time));
HANDLE process = OpenProcess(SYNCHRONIZE,
FALSE,
entry->th32ProcessID);
@@ -451,18 +450,18 @@ bool WaitForProcessesToExit(const std::wstring& executable_name,
return result;
}
-bool WaitForSingleProcess(ProcessHandle handle, int wait_milliseconds) {
+bool WaitForSingleProcess(ProcessHandle handle, int64 wait_milliseconds) {
bool retval = WaitForSingleObject(handle, wait_milliseconds) == WAIT_OBJECT_0;
return retval;
}
-bool CrashAwareSleep(ProcessHandle handle, int wait_milliseconds) {
+bool CrashAwareSleep(ProcessHandle handle, int64 wait_milliseconds) {
bool retval = WaitForSingleObject(handle, wait_milliseconds) == WAIT_TIMEOUT;
return retval;
}
bool CleanupProcesses(const std::wstring& executable_name,
- int wait_milliseconds,
+ int64 wait_milliseconds,
int exit_code,
const ProcessFilter* filter) {
bool exited_cleanly = WaitForProcessesToExit(executable_name,