diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-03-24 04:37:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-03-24 04:37:07 +0000 |
| commit | 291cd954fbfa48d8db79f22ffa8d596c837f7ee3 (patch) | |
| tree | c5ee727969ee7d110179eddee8a963fcfe313a4c /src/backend/access/transam/xlog.c | |
| parent | 3781b72c22f766b390d29c4b9c6adbdc6997c774 (diff) | |
| download | postgresql-291cd954fbfa48d8db79f22ffa8d596c837f7ee3.tar.gz postgresql-291cd954fbfa48d8db79f22ffa8d596c837f7ee3.zip | |
Change Win32 O_SYNC method to O_DSYNC because that is what the method
currently does. This is now the default Win32 wal sync method because
we perfer o_datasync to fsync.
Also, change Win32 fsync to a new wal sync method called
fsync_writethrough because that is the behavior of _commit, which is
what is used for fsync on Win32.
Backpatch to 8.0.X.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index ec00dbd11f5..fad0927ac6f 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.180 2004/12/31 21:59:30 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.180.4.1 2005/03/24 04:36:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,8 +63,13 @@ #endif #endif +#if defined(O_DSYNC) #if defined(OPEN_SYNC_FLAG) -#if defined(O_DSYNC) && (O_DSYNC != OPEN_SYNC_FLAG) +#if O_DSYNC != OPEN_SYNC_FLAG +#define OPEN_DATASYNC_FLAG O_DSYNC +#endif +#else /* !defined(OPEN_SYNC_FLAG) */ +/* Win32 only has O_DSYNC */ #define OPEN_DATASYNC_FLAG O_DSYNC #endif #endif @@ -79,7 +84,11 @@ #define DEFAULT_SYNC_METHOD SYNC_METHOD_FDATASYNC #define DEFAULT_SYNC_FLAGBIT 0 #else +#ifndef FSYNC_IS_WRITE_THROUGH #define DEFAULT_SYNC_METHOD_STR "fsync" +#else +#define DEFAULT_SYNC_METHOD_STR "fsync_writethrough" +#endif #define DEFAULT_SYNC_METHOD SYNC_METHOD_FSYNC #define DEFAULT_SYNC_FLAGBIT 0 #endif @@ -5154,7 +5163,12 @@ assign_xlog_sync_method(const char *method, bool doit, GucSource source) int new_sync_method; int new_sync_bit; +#ifndef FSYNC_IS_WRITE_THROUGH if (pg_strcasecmp(method, "fsync") == 0) +#else + /* Win32 fsync() == _commit(0, which writes through a write cache */ + if (pg_strcasecmp(method, "fsync_writethrough") == 0) +#endif { new_sync_method = SYNC_METHOD_FSYNC; new_sync_bit = 0; |