diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/port/win32/signal.c | 16 | ||||
| -rw-r--r-- | src/backend/postmaster/syslogger.c | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index 06b45c8eb92..d12e29990fd 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.16 2006/03/05 15:58:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.17 2006/07/16 20:17:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -41,11 +41,19 @@ static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT]; static DWORD WINAPI pg_signal_thread(LPVOID param); static BOOL WINAPI pg_console_handler(DWORD dwCtrlType); -/* Sleep function that can be interrupted by signals */ + +/* + * pg_usleep --- delay the specified number of microseconds, but + * stop waiting if a signal arrives. + * + * This replaces the non-signal-aware version provided by src/port/pgsleep.c. + */ void -pgwin32_backend_usleep(long microsec) +pg_usleep(long microsec) { - if (WaitForSingleObject(pgwin32_signal_event, (microsec < 500 ? 1 : (microsec + 500) / 1000)) == WAIT_OBJECT_0) + if (WaitForSingleObject(pgwin32_signal_event, + (microsec < 500 ? 1 : (microsec + 500) / 1000)) + == WAIT_OBJECT_0) { pgwin32_dispatch_queued_signals(); errno = EINTR; diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 1fff118e44f..23ff158fc61 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -18,7 +18,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.27 2006/07/11 18:26:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.28 2006/07/16 20:17:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -348,7 +348,7 @@ SysLoggerMain(int argc, char *argv[]) * detect pipe EOF. The main thread just wakes up once a second to * check for SIGHUP and rotation conditions. */ - pgwin32_backend_usleep(1000000); + pg_usleep(1000000L); #endif /* WIN32 */ if (pipe_eof_seen) |