Centralize effective_cache_size default setting

bmomjian · bmomjian · commit 0c6b67507631 · 2013-10-09T08:33:12.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,6 @@ AuxiliaryProcessMain(int argc, char *argv[])`
`350`	`350`	`proc_exit(1);`
`351`	`351`	`}`
`352`	`352`
`353`		`- set_default_effective_cache_size();`
`354`		`-`
`355`	`353`	`/* Validate we have been given a reasonable-looking DataDir */`
`356`	`354`	`Assert(DataDir);`
`357`	`355`	`ValidatePgVersion(DataDir);`
Original file line number	Diff line number	Diff line change
`@@ -785,8 +785,6 @@ PostmasterMain(int argc, char *argv[])`
`785`	`785`	`if (!SelectConfigFiles(userDoption, progname))`
`786`	`786`	`ExitPostmaster(2);`
`787`	`787`
`788`		`- set_default_effective_cache_size();`
`789`		`-`
`790`	`788`	`if (output_config_variable != NULL)`
`791`	`789`	`{`
`792`	`790`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -3592,8 +3592,6 @@ PostgresMain(int argc, char *argv[],`
`3592`	`3592`	`proc_exit(1);`
`3593`	`3593`	`}`
`3594`	`3594`
`3595`		`- set_default_effective_cache_size();`
`3596`		`-`
`3597`	`3595`	`/*`
`3598`	`3596`	`* You might expect to see a setsid() call here, but it's not needed,`
`3599`	`3597`	`* because if we are under a postmaster then BackendInitialize() did it.`