From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 9 Aug 2006 17:47:06 +0000 (+0000)
Subject: Fix statement_timeout on Win32 so that it properly treats micro-seconds
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=e8171982e7948a4be0ef947401ff9423ee1af7e9;p=users%2Fbernd%2Fpostgres.git

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.
---

diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c
index 778e16102d..b8f1e8bd68 100644
--- a/src/backend/port/win32/timer.c
+++ b/src/backend/port/win32/timer.c
@@ -56,7 +56,8 @@ pg_timer_thread(LPVOID param)
 				timerCommArea.value.it_value.tv_usec == 0)
 				waittime = INFINITE;	/* Cancel the interrupt */
 			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);
 			LeaveCriticalSection(&timerCommArea.crit_sec);
 		}