diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-04-19 17:42:59 +0000 |
| commit | 31338352bd89439c7c55d25c13d88338fa874771 (patch) | |
| tree | 318c34ab817a8d3e47b2fa6fa1c37ceacd8541a4 /src/backend/port/win32/timer.c | |
| parent | 862b20b3822887bdb3b42a72ea0e73dc8028fb31 (diff) | |
| download | postgresql-31338352bd89439c7c55d25c13d88338fa874771.tar.gz postgresql-31338352bd89439c7c55d25c13d88338fa874771.zip | |
* Most changes are to fix warnings issued when compiling win32
* removed a few redundant defines
* get_user_name safe under win32
* rationalized pipe read EOF for win32 (UPDATED PATCH USED)
* changed all backend instances of sleep() to pg_usleep
- except for the SLEEP_ON_ASSERT in assert.c, as it would exceed a
32-bit long [Note to patcher: If a SLEEP_ON_ASSERT of 2000 seconds is
acceptable, please replace with pg_usleep(2000000000L)]
I added a comment to that part of the code:
/*
* It would be nice to use pg_usleep() here, but only does 2000 sec
* or 33 minutes, which seems too short.
*/
sleep(1000000);
Claudio Natoli
Diffstat (limited to 'src/backend/port/win32/timer.c')
| -rw-r--r-- | src/backend/port/win32/timer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index 8202efe3c4b..b905799875a 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.1 2004/02/18 16:25:12 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.2 2004/04/19 17:42:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,9 +43,9 @@ int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue timerHandle = CreateWaitableTimer(NULL, TRUE, NULL); if (timerHandle == NULL) ereport(FATAL, - (errmsg_internal("failed to create waitable timer: %i",GetLastError()))); + (errmsg_internal("failed to create waitable timer: %i",(int)GetLastError()))); } - + if (value->it_value.tv_sec == 0 && value->it_value.tv_usec == 0) { /* Turn timer off */ @@ -55,11 +55,11 @@ int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue /* Negative time to SetWaitableTimer means relative time */ dueTime.QuadPart = -(value->it_value.tv_usec*10 + value->it_value.tv_sec*10000000L); - + /* Turn timer on, or change timer */ - if (!SetWaitableTimer(timerHandle, &dueTime, 0, timer_completion, NULL, FALSE)) + if (!SetWaitableTimer(timerHandle, &dueTime, 0, timer_completion, NULL, FALSE)) ereport(FATAL, - (errmsg_internal("failed to set waitable timer: %i",GetLastError()))); + (errmsg_internal("failed to set waitable timer: %i",(int)GetLastError()))); return 0; } |