diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/xlog.h | 7 | ||||
| -rw-r--r-- | src/include/access/xlogdefs.h | 8 | ||||
| -rw-r--r-- | src/include/utils/guc.h | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 3e3163c5f8f..a3e8c2f6a94 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.87 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.88 2008/05/12 08:35:05 mha Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -88,8 +88,9 @@ typedef struct XLogRecord /* Sync methods */ #define SYNC_METHOD_FSYNC 0 #define SYNC_METHOD_FDATASYNC 1 -#define SYNC_METHOD_OPEN 2 /* for O_SYNC and O_DSYNC */ +#define SYNC_METHOD_OPEN 2 /* for O_SYNC */ #define SYNC_METHOD_FSYNC_WRITETHROUGH 3 +#define SYNC_METHOD_OPEN_DSYNC 4 /* for O_DSYNC */ extern int sync_method; /* @@ -141,8 +142,6 @@ extern int XLOGbuffers; extern bool XLogArchiveMode; extern char *XLogArchiveCommand; extern int XLogArchiveTimeout; -extern char *XLOG_sync_method; -extern const char XLOG_sync_method_default[]; extern bool log_checkpoints; #define XLogArchivingActive() (XLogArchiveMode) diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index 4129025d37d..17b3e51e1ea 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlogdefs.h,v 1.19 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/xlogdefs.h,v 1.20 2008/05/12 08:35:05 mha Exp $ */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H @@ -109,19 +109,15 @@ typedef uint32 TimeLineID; #endif #if defined(OPEN_DATASYNC_FLAG) -#define DEFAULT_SYNC_METHOD_STR "open_datasync" -#define DEFAULT_SYNC_METHOD SYNC_METHOD_OPEN +#define DEFAULT_SYNC_METHOD SYNC_METHOD_OPEN_DSYNC #define DEFAULT_SYNC_FLAGBIT OPEN_DATASYNC_FLAG #elif defined(HAVE_FDATASYNC) -#define DEFAULT_SYNC_METHOD_STR "fdatasync" #define DEFAULT_SYNC_METHOD SYNC_METHOD_FDATASYNC #define DEFAULT_SYNC_FLAGBIT 0 #elif defined(HAVE_FSYNC_WRITETHROUGH_ONLY) -#define DEFAULT_SYNC_METHOD_STR "fsync_writethrough" #define DEFAULT_SYNC_METHOD SYNC_METHOD_FSYNC_WRITETHROUGH #define DEFAULT_SYNC_FLAGBIT 0 #else -#define DEFAULT_SYNC_METHOD_STR "fsync" #define DEFAULT_SYNC_METHOD SYNC_METHOD_FSYNC #define DEFAULT_SYNC_FLAGBIT 0 #endif diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index b6103550ad0..fc737ec4cf4 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2008, PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.94 2008/04/18 01:42:17 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.95 2008/05/12 08:35:05 mha Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -267,7 +267,7 @@ extern const char *assign_search_path(const char *newval, bool doit, GucSource source); /* in access/transam/xlog.c */ -extern const char *assign_xlog_sync_method(const char *method, - bool doit, GucSource source); +extern bool assign_xlog_sync_method(int newval, + bool doit, GucSource source); #endif /* GUC_H */ |