database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Cosmetic cleanups in initdb.c.

Browse Source 
Commit bcbd94080 didn't bother to fix up a comment it had falsified.

Also, const-ify choose_dsm_implementation(), since what it's returning
is always a constant string; pickier compilers would warn about this.
This commit is contained in:
Tom Lane
2018-08-10 14:14:27 -04:00
parent f841ceb26d
commit d4a900458e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/initdb/initdb.c
View File

@ -173,7 +173,7 @@ static char *pgdata_native;
/* defaults */ /* defaults */
static int n_connections = 10; static int n_connections = 10;
static int n_buffers = 50; static int n_buffers = 50;
static char *dynamic_shared_memory_type = NULL; static const char *dynamic_shared_memory_type = NULL;
/* /*
* Warning messages for authentication methods * Warning messages for authentication methods
@ -916,7 +916,7 @@ set_null_conf(void)
* the postmaster either, and configure the cluster for System V shared * the postmaster either, and configure the cluster for System V shared
* memory instead. * memory instead.
*/ */
static char * static const char *
choose_dsm_implementation(void) choose_dsm_implementation(void)
{ {
#ifdef HAVE_SHM_OPEN #ifdef HAVE_SHM_OPEN
@ -952,9 +952,7 @@ choose_dsm_implementation(void)
/* /*
* Determine platform-specific config settings * Determine platform-specific config settings
* *
* Use reasonable values if kernel will let us, else scale back. Probe * Use reasonable values if kernel will let us, else scale back.
* for max_connections first since it is subject to more constraints than
* shared_buffers.
*/ */
static void static void
test_config_settings(void) test_config_settings(void)
@ -983,7 +981,6 @@ test_config_settings(void)
test_buffs, test_buffs,
ok_buffers = 0; ok_buffers = 0;
/* /*
* Need to determine working DSM implementation first so that subsequent * Need to determine working DSM implementation first so that subsequent
* tests don't fail because DSM setting doesn't work. * tests don't fail because DSM setting doesn't work.
@ -993,6 +990,10 @@ test_config_settings(void)
dynamic_shared_memory_type = choose_dsm_implementation(); dynamic_shared_memory_type = choose_dsm_implementation();
printf("%s\n", dynamic_shared_memory_type); printf("%s\n", dynamic_shared_memory_type);
/*
* Probe for max_connections before shared_buffers, since it is subject to
* more constraints than shared_buffers.
*/
printf(_("selecting default max_connections ... ")); printf(_("selecting default max_connections ... "));
fflush(stdout); fflush(stdout);