From ddf343855d787520d1ac72c7dcfdeb91e72731da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Thu, 8 May 2014 10:36:27 +0000 Subject: The PyCOND_TIMEDWAIT must use microseconds for the timeout argument in order to have the same resolution as pthreads condition variables. At the same time, it must be large enough to accept 31 bits of milliseconds, which is the maximum timeout value in the windows API. A PY_LONG_LONG of microseconds fullfills both requirements. This closes issue #20737 --- Python/thread_nt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Python/thread_nt.h') diff --git a/Python/thread_nt.h b/Python/thread_nt.h index 938bf1e3fe..b157fc54a9 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h @@ -77,7 +77,7 @@ EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds) /* wait at least until the target */ DWORD now, target = GetTickCount() + milliseconds; while (mutex->locked) { - if (PyCOND_TIMEDWAIT(&mutex->cv, &mutex->cs, milliseconds*1000) < 0) { + if (PyCOND_TIMEDWAIT(&mutex->cv, &mutex->cs, (PY_LONG_LONG)milliseconds*1000) < 0) { result = WAIT_FAILED; break; } -- cgit v1.2.1