git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c

index 88d4b6d58570277562558a440d8af71c5697dfb7..384ca9d4516a4dffe6be0a032026bd74cab22c46 100644 (file)

--- a/src/backend/port/win32/timer.c

+++ b/src/backend/port/win32/timer.c

* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.11 2006年08月09日 20:40:56 momjian Exp $

+ * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.12 2006年08月09日 21:18:13 momjian Exp $

*

*-------------------------------------------------------------------------

*/

waittime = INFINITE; /* Cancel the interrupt */

else

{

- /* Minimum wait time is 1ms */

- if (timerCommArea.value.it_value.tv_sec == 0 &&

- timerCommArea.value.it_value.tv_usec < 1000)

- timerCommArea.value.it_value.tv_usec = 1000;

- /* WaitForSingleObjectEx() uses milliseconds */

- waittime = timerCommArea.value.it_value.tv_usec / 1000 + timerCommArea.value.it_value.tv_sec * 1000;

+ /* WaitForSingleObjectEx() uses milliseconds, round up */

+ waittime = (timerCommArea.value.it_value.tv_usec + 999) / 1000 +

+ timerCommArea.value.it_value.tv_sec * 1000;

}

ResetEvent(timerCommArea.event);

LeaveCriticalSection(&timerCommArea.crit_sec);