diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-08-09 17:47:06 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-08-09 17:47:06 +0000 |
| commit | 1e35f9aa048183ecf18227e5a4cb08c64693e645 (patch) | |
| tree | 801a2ce1766ba665ef18c9ea9cc9dd2f0152615a | |
| parent | 73761f3659dece410899a3876193e5cbf3a6ab9d (diff) | |
| download | postgresql-1e35f9aa048183ecf18227e5a4cb08c64693e645.tar.gz postgresql-1e35f9aa048183ecf18227e5a4cb08c64693e645.zip | |
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.
| -rw-r--r-- | src/backend/port/win32/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index de07a8d97a9..262edda72b1 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * 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) 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); } |