diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-11-23 17:20:47 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-11-23 17:20:47 +0000 |
| commit | 1120c61b29c2804f921b4302769e73924c0e2893 (patch) | |
| tree | 7c9e0348a43478ce5cc56718ee104bdaf167c290 | |
| parent | 3455b0a5d57b8139b82b3e0f1cf4f7893173995d (diff) | |
| download | postgresql-1120c61b29c2804f921b4302769e73924c0e2893.tar.gz postgresql-1120c61b29c2804f921b4302769e73924c0e2893.zip | |
Revert out:
Update fsync test to match new O_DIRECT behavior.
Greg Smith
| -rw-r--r-- | src/tools/fsync/test_fsync.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/tools/fsync/test_fsync.c b/src/tools/fsync/test_fsync.c index c313021155e..32d3aff003b 100644 --- a/src/tools/fsync/test_fsync.c +++ b/src/tools/fsync/test_fsync.c @@ -14,7 +14,6 @@ #include <time.h> #include <sys/time.h> #include <unistd.h> -#include <string.h> #ifdef WIN32 #define FSYNC_FILENAME "./test_fsync.out" @@ -22,34 +21,21 @@ #define FSYNC_FILENAME "/var/tmp/test_fsync.out" #endif -/* This logic comes from src/backend/access/transam/xlog.c where it's - better documented */ -#ifdef O_DIRECT -#define PG_O_DIRECT O_DIRECT -#else -#define PG_O_DIRECT 0 -#endif - +/* O_SYNC and O_FSYNC are the same */ #if defined(O_SYNC) -#define BARE_OPEN_SYNC_FLAG O_SYNC +#define OPEN_SYNC_FLAG O_SYNC #elif defined(O_FSYNC) -#define BARE_OPEN_SYNC_FLAG O_FSYNC -#endif -#ifdef BARE_OPEN_SYNC_FLAG -#define OPEN_SYNC_FLAG (BARE_OPEN_SYNC_FLAG | PG_O_DIRECT) +#define OPEN_SYNC_FLAG O_FSYNC +#elif defined(O_DSYNC) +#define OPEN_DATASYNC_FLAG O_DSYNC #endif -#if defined(O_DSYNC) #if defined(OPEN_SYNC_FLAG) -#if O_DSYNC != BARE_OPEN_SYNC_FLAG -#define OPEN_DATASYNC_FLAG (O_DSYNC | PG_O_DIRECT) -#endif -#else -#define OPEN_DATASYNC_FLAG (O_DSYNC | PG_O_DIRECT) +#if defined(O_DSYNC) && (O_DSYNC != OPEN_SYNC_FLAG) +#define OPEN_DATASYNC_FLAG O_DSYNC #endif #endif - #define WAL_FILE_SIZE (16 * 1024 * 1024) void die(char *str); |