diff options
Diffstat (limited to 'src/backend/port/win32')
| -rw-r--r-- | src/backend/port/win32/signal.c | 8 | ||||
| -rw-r--r-- | src/backend/port/win32/timer.c | 21 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index 3204c9c20e1..978e0339f17 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.14 2005/10/25 15:15:16 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.14.2.1 2005/11/22 18:23:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,10 +22,10 @@ * pg_signal_mask is only changed by main thread so shouldn't need it. */ volatile int pg_signal_queue; -int pg_signal_mask; +int pg_signal_mask; -HANDLE pgwin32_signal_event; -HANDLE pgwin32_initial_signal_pipe = INVALID_HANDLE_VALUE; +HANDLE pgwin32_signal_event; +HANDLE pgwin32_initial_signal_pipe = INVALID_HANDLE_VALUE; /* * pg_signal_crit_sec is used to protect only pg_signal_queue. That is the only diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index b6c0b407e6e..de07a8d97a9 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -3,15 +3,15 @@ * timer.c * Microsoft Windows Win32 Timer Implementation * - * Limitations of this implementation: + * Limitations of this implementation: * - * - Does not support interval timer (value->it_interval) - * - Only supports ITIMER_REAL + * - Does not support interval timer (value->it_interval) + * - Only supports ITIMER_REAL * * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.6 2005/10/25 15:15:16 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.6.2.1 2005/11/22 18:23:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,12 @@ /* Communication area for inter-thread communication */ -typedef struct timerCA { +typedef struct timerCA +{ struct itimerval value; - HANDLE event; + HANDLE event; CRITICAL_SECTION crit_sec; -} timerCA; +} timerCA; static timerCA timerCommArea; static HANDLE timerThreadHandle = INVALID_HANDLE_VALUE; @@ -36,7 +37,7 @@ static HANDLE timerThreadHandle = INVALID_HANDLE_VALUE; static DWORD WINAPI pg_timer_thread(LPVOID param) { - DWORD waittime; + DWORD waittime; Assert(param == NULL); @@ -44,7 +45,7 @@ pg_timer_thread(LPVOID param) for (;;) { - int r; + int r; r = WaitForSingleObjectEx(timerCommArea.event, waittime, FALSE); if (r == WAIT_OBJECT_0) @@ -53,7 +54,7 @@ pg_timer_thread(LPVOID param) EnterCriticalSection(&timerCommArea.crit_sec); if (timerCommArea.value.it_value.tv_sec == 0 && timerCommArea.value.it_value.tv_usec == 0) - waittime = INFINITE; /* Cancel the interrupt */ + waittime = INFINITE; /* Cancel the interrupt */ else waittime = timerCommArea.value.it_value.tv_usec / 10 + timerCommArea.value.it_value.tv_sec * 1000; ResetEvent(timerCommArea.event); |