aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2013-10-09 08:33:12 -0400
committerBruce Momjian <bruce@momjian.us>2013-10-09 08:33:12 -0400
commit0c6b67507631fd9f563e0329da418060f45ac1f0 (patch)
treed14fec2bc4c75310d602ec6cc3d351afad5921bc /src
parent96dfa6ec0d809bb49f3472921b3ed941d9bd1b8c (diff)
downloadpostgresql-0c6b67507631fd9f563e0329da418060f45ac1f0.tar.gz
postgresql-0c6b67507631fd9f563e0329da418060f45ac1f0.zip
Centralize effective_cache_size default setting
Diffstat (limited to 'src')
-rw-r--r--src/backend/bootstrap/bootstrap.c2
-rw-r--r--src/backend/postmaster/postmaster.c2
-rw-r--r--src/backend/tcop/postgres.c2
-rw-r--r--src/backend/utils/misc/guc.c2
4 files changed, 2 insertions, 6 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 08687f4ff55..d23dc4504ae 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -350,8 +350,6 @@ AuxiliaryProcessMain(int argc, char *argv[])
proc_exit(1);
}
- set_default_effective_cache_size();
-
/* Validate we have been given a reasonable-looking DataDir */
Assert(DataDir);
ValidatePgVersion(DataDir);
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index bd20e14ea57..c9a8a8fc459 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -785,8 +785,6 @@ PostmasterMain(int argc, char *argv[])
if (!SelectConfigFiles(userDoption, progname))
ExitPostmaster(2);
- set_default_effective_cache_size();
-
if (output_config_variable != NULL)
{
/*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 4b2a7761af8..1eaf287eec9 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3592,8 +3592,6 @@ PostgresMain(int argc, char *argv[],
proc_exit(1);
}
- set_default_effective_cache_size();
-
/*
* You might expect to see a setsid() call here, but it's not needed,
* because if we are under a postmaster then BackendInitialize() did it.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 833f34b1ee2..ddbeb34ce72 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4238,6 +4238,8 @@ SelectConfigFiles(const char *userDoption, const char *progname)
*/
pg_timezone_abbrev_initialize();
+ set_default_effective_cache_size();
+
/*
* Figure out where pg_hba.conf is, and make sure the path is absolute.
*/