Move new effective_cache_size function

Previously set_default_effective_cache_size() could not handle fork,
non-fork, and bootstrap cases.

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index d23dc4504aed1694911022f59f544840fa790152..53c55a36948a6fc28fd3362466ff20fbe6cc49e0 100644 (file)
--- 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 c4b54d12cb29624171a62a095ec67e5d1d6ae97d..73babdaf5ffec3aba6e4db2b85346864fe6861d0 100644 (file)
--- 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
         */