diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-01-30 15:57:04 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-01-30 15:57:04 +0000 |
| commit | 5ee2ae20495647ea7ed7b924a01dd3c8d4a0597b (patch) | |
| tree | 1f4ecf3f04e44120dd514975f2096aa681953a1d /src | |
| parent | 777babeced83ea68012482e6fe58e3f2081de281 (diff) | |
| download | postgresql-5ee2ae20495647ea7ed7b924a01dd3c8d4a0597b.tar.gz postgresql-5ee2ae20495647ea7ed7b924a01dd3c8d4a0597b.zip | |
Remove sleep() and use single PG_SLEEP call for Win32 signal handling
and consistency.
Change PG_USLEEP to use SleepEx() for signal interuptability.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 7 | ||||
| -rw-r--r-- | src/include/miscadmin.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 5eee0c5bbc7..49e2315dad4 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.153 2004/01/24 20:00:45 wieck Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.154 2004/01/30 15:57:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1058,10 +1058,7 @@ BufferBackgroundWriter(void) * Nap for the configured time or sleep for 10 seconds if * there was nothing to do at all. */ - if (n > 0) - PG_USLEEP(BgWriterDelay * 1000); - else - sleep(10); + PG_USLEEP((n > 0) ? BgWriterDelay * 1000 : 10000000); } } diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index b44d160c27f..c62ab783a34 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.148 2004/01/26 22:59:53 momjian Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.149 2004/01/30 15:57:04 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -109,7 +109,7 @@ do { \ #else #define PG_USLEEP(_usec) \ do { \ - Sleep((_usec) < 500 ? 1 : ((_usec)+500)/ 1000); \ + SleepEx(((_usec) < 500 ? 1 : ((_usec) + 500) / 1000), TRUE); \ } while(0) #endif |