aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2013-10-08 22:41:23 -0400
committerBruce Momjian <bruce@momjian.us>2013-10-08 22:41:23 -0400
commitcbafd6618af9f10e89ed05ff82dac69e65a70307 (patch)
tree7c89c2169a6872ee15316dc375b0651a62bd1eaa /src
parentbf46524b3136928bfe61c782a950a30638bbd159 (diff)
downloadpostgresql-cbafd6618af9f10e89ed05ff82dac69e65a70307.tar.gz
postgresql-cbafd6618af9f10e89ed05ff82dac69e65a70307.zip
Move new effective_cache_size function
Previously set_default_effective_cache_size() could not handle fork, non-fork, and bootstrap cases.
Diffstat (limited to 'src')
-rw-r--r--src/backend/bootstrap/bootstrap.c2
-rw-r--r--src/backend/postmaster/postmaster.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index d23dc4504ae..53c55a36948 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -312,6 +312,8 @@ AuxiliaryProcessMain(int argc, char *argv[])
proc_exit(1);
}
+ set_default_effective_cache_size();
+
/*
* Identify myself via ps
*/
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c4b54d12cb2..73babdaf5ff 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -778,6 +778,8 @@ PostmasterMain(int argc, char *argv[])
ExitPostmaster(1);
}
+ set_default_effective_cache_size();
+
/*
* Locate the proper configuration files and data directory, and read
* postgresql.conf for the first time.
@@ -4476,8 +4478,6 @@ SubPostmasterMain(int argc, char *argv[])
memset(&port, 0, sizeof(Port));
read_backend_variables(argv[2], &port);
- set_default_effective_cache_size();
-
/*
* Set reference point for stack-depth checking
*/