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

bmomjian · bmomjian · commit 8f73c88c7cc0 · 2006-08-09T17:47:03.000Z
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
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.9 2006/08/09 17:33:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.10 2006/08/09 17:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.9 2006/08/09 17:33:52 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.10 2006/08/09 17:47:03 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -56,7 +56,8 @@ pg_timer_thread(LPVOID param)`
`56`	`56`	`timerCommArea.value.it_value.tv_usec == 0)`
`57`	`57`	`waittime = INFINITE; /* Cancel the interrupt */`
`58`	`58`	`else`
`59`		`- waittime = timerCommArea.value.it_value.tv_usec / 10 + timerCommArea.value.it_value.tv_sec * 1000;`
	`59`	`+ /* WaitForSingleObjectEx() uses milliseconds */`
	`60`	`+ waittime = timerCommArea.value.it_value.tv_usec / 1000 + timerCommArea.value.it_value.tv_sec * 1000;`
`60`	`61`	`ResetEvent(timerCommArea.event);`
`61`	`62`	`LeaveCriticalSection(&timerCommArea.crit_sec);`
`62`	`63`	`}`