1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00

Fix statement_timeout on Win32 so that it properly treats micro-seconds

as micro-seconds, rather than as 100 microseconds, as it does now.  This
actually fixes all setitimer calls on Win32, but statement_timeout is
the most visible fix.

Backpatch to 8.1.X.  8.0 works as documented.
This commit is contained in:
Bruce Momjian 2006-08-09 17:47:06 +00:00
parent 73761f3659
commit 1e35f9aa04

View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.6.2.1 2005/11/22 18:23:15 momjian Exp $ * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.6.2.2 2006/08/09 17:47:06 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -56,7 +56,8 @@ pg_timer_thread(LPVOID param)
timerCommArea.value.it_value.tv_usec == 0) timerCommArea.value.it_value.tv_usec == 0)
waittime = INFINITE; /* Cancel the interrupt */ waittime = INFINITE; /* Cancel the interrupt */
else else
waittime = timerCommArea.value.it_value.tv_usec / 10 + timerCommArea.value.it_value.tv_sec * 1000; /* WaitForSingleObjectEx() uses milliseconds */
waittime = timerCommArea.value.it_value.tv_usec / 1000 + timerCommArea.value.it_value.tv_sec * 1000;
ResetEvent(timerCommArea.event); ResetEvent(timerCommArea.event);
LeaveCriticalSection(&timerCommArea.crit_sec); LeaveCriticalSection(&timerCommArea.crit_sec);
} }