diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-03-17 17:28:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-03-17 17:28:59 +0000 |
| commit | 7911e3a081ecebc116501da46806e32fa1a1c40a (patch) | |
| tree | 364afc5717f218a34fbad9adadae74b7110d6329 | |
| parent | 89ea098714e0df3bc35f9a69c291666e77cd84ff (diff) | |
| download | postgresql-7911e3a081ecebc116501da46806e32fa1a1c40a.tar.gz postgresql-7911e3a081ecebc116501da46806e32fa1a1c40a.zip | |
Backpatch to 8.0.X, already in HEAD:
Allow Win32 to support the O_SYNC open flag as an wal_sync_method
method.
| -rw-r--r-- | src/include/port.h | 5 | ||||
| -rw-r--r-- | src/include/port/win32.h | 10 | ||||
| -rw-r--r-- | src/port/open.c | 8 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/include/port.h b/src/include/port.h index 54984fe437c..6e5443294e9 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.69 2005/01/06 00:59:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.69.4.1 2005/03/17 17:28:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -174,7 +174,8 @@ extern bool rmtree(char *path, bool rmtopdir); #if defined(WIN32) && !defined(__CYGWIN__) -/* open() replacement to allow delete of held files */ +/* open() replacement to allow delete of held files and passing + * of special options. */ #ifndef WIN32_CLIENT_ONLY extern int win32_open(const char *, int,...); diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 9049fb4327f..f93058edc07 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.42 2004/12/26 19:20:33 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.42.4.1 2005/03/17 17:28:59 momjian Exp $ */ /* undefine and redefine after #include */ #undef mkdir @@ -184,6 +184,14 @@ typedef int pid_t; #define lstat(path, sb) stat((path), (sb)) /* + * Supplement to <fcntl.h>. + * This is the same value as _O_NOINHERIT in the MS header file. This is + * to ensure that we don't collide with a future definition. It means + * we cannot use _O_NOINHERIT ourselves. + */ +#define O_SYNC 0x0080 + +/* * Supplement to <errno.h>. */ #undef EAGAIN diff --git a/src/port/open.c b/src/port/open.c index b61b66f493e..3ff6b0e2dda 100644 --- a/src/port/open.c +++ b/src/port/open.c @@ -6,13 +6,14 @@ * * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/open.c,v 1.7 2004/12/31 22:03:53 pgsql Exp $ + * $PostgreSQL: pgsql/src/port/open.c,v 1.7.4.1 2005/03/17 17:28:59 momjian Exp $ * *------------------------------------------------------------------------- */ #ifdef WIN32 +#include <postgres.h> #include <windows.h> #include <fcntl.h> #include <errno.h> @@ -62,7 +63,7 @@ win32_open(const char *fileName, int fileFlags,...) /* Check that we can handle the request */ assert((fileFlags & ((O_RDONLY | O_WRONLY | O_RDWR) | O_APPEND | (O_RANDOM | O_SEQUENTIAL | O_TEMPORARY) | - _O_SHORT_LIVED | + _O_SHORT_LIVED | O_SYNC | (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags); sa.nLength = sizeof(sa); @@ -81,7 +82,8 @@ win32_open(const char *fileName, int fileFlags,...) ((fileFlags & O_RANDOM) ? FILE_FLAG_RANDOM_ACCESS : 0) | ((fileFlags & O_SEQUENTIAL) ? FILE_FLAG_SEQUENTIAL_SCAN : 0) | ((fileFlags & _O_SHORT_LIVED) ? FILE_ATTRIBUTE_TEMPORARY : 0) | - ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0), + ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0)| + ((fileFlags & O_SYNC) ? FILE_FLAG_WRITE_THROUGH : 0), NULL)) == INVALID_HANDLE_VALUE) { switch (GetLastError()) |