diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c index 7145101133..cd6ed080a4 100644 --- a/src/backend/port/ipc_test.c +++ b/src/backend/port/ipc_test.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/ipc_test.c,v 1.9 2003/08/04 02:40:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/ipc_test.c,v 1.10 2003/08/26 15:38:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -50,8 +50,8 @@ const bool ExecBackend = false; bool IsUnderPostmaster = false; -int MaxBackends = DEF_MAXBACKENDS; -int NBuffers = DEF_NBUFFERS; +int MaxBackends = 32; +int NBuffers = 64; #ifndef assert_enabled bool assert_enabled = true; diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 6f4676149f..1790dd85c1 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.360 2003/08/13 16:16:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.361 2003/08/26 15:38:24 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1978,7 +1978,7 @@ usage(char *progname) #ifdef USE_ASSERT_CHECKING printf(" -A 1|0 enable/disable run-time assert checking\n"); #endif - printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS); + printf(" -B NBUFFERS number of shared buffers\n"); printf(" -c NAME=VALUE set run-time parameter\n"); printf(" -d 0-5 debugging level (0 is off)\n"); printf(" -D DATADIR database directory\n"); @@ -2651,7 +2651,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.360 $ $Date: 2003/08/13 16:16:23 $\n"); + puts("$Revision: 1.361 $ $Date: 2003/08/26 15:38:24 $\n"); } /* diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index bc5c36ab87..abaf645bdb 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.74 2003/08/04 02:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.75 2003/08/26 15:38:25 tgl Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -70,4 +70,4 @@ bool enableFsync = true; bool allowSystemTableMods = false; int SortMem = 1024; int VacuumMem = 8192; -int NBuffers = DEF_NBUFFERS; +int NBuffers = 1000; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c3c85354ca..0a4fd21810 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.150 2003/08/17 22:19:15 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.151 2003/08/26 15:38:25 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -944,7 +944,7 @@ static struct config_int ConfigureNamesInt[] = NULL }, &MaxBackends, - DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL + 100, 1, INT_MAX, NULL, NULL }, { @@ -962,7 +962,7 @@ static struct config_int ConfigureNamesInt[] = NULL }, &NBuffers, - DEF_NBUFFERS, 16, INT_MAX, NULL, NULL + 1000, 16, INT_MAX, NULL, NULL }, { diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index f506474c5e..a30ae074a1 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -28,7 +28,7 @@ # - Connection Settings - #tcpip_socket = false -#max_connections = 32 +#max_connections = 100 # note: increasing max_connections costs about 500 bytes of shared # memory per connection slot, in addition to costs from shared_buffers # and max_locks_per_transaction. @@ -55,7 +55,7 @@ # - Memory - -#shared_buffers = 64 # min 16, at least max_connections*2, 8KB each +#shared_buffers = 1000 # min 16, at least max_connections*2, 8KB each #sort_mem = 1024 # min 64, size in KB #vacuum_mem = 8192 # min 1024, size in KB diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index 5908416ce4..94e5b21d74 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -27,7 +27,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.199 2003/07/27 04:35:53 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.200 2003/08/26 15:38:25 tgl Exp $ # #------------------------------------------------------------------------- @@ -586,8 +586,8 @@ $ECHO_N "creating configuration files... "$ECHO_C cp "$PG_HBA_SAMPLE" "$PGDATA"/pg_hba.conf || exit_nicely cp "$PG_IDENT_SAMPLE" "$PGDATA"/pg_ident.conf || exit_nicely -sed -e "s/^#shared_buffers = 64/shared_buffers = $nbuffers/" \ - -e "s/^#max_connections = 32/max_connections = $nconns/" \ +sed -e "s/^#shared_buffers = 1000/shared_buffers = $nbuffers/" \ + -e "s/^#max_connections = 100/max_connections = $nconns/" \ -e "s/^#lc_messages = 'C'/lc_messages = '`pg_getlocale MESSAGES`'/" \ -e "s/^#lc_monetary = 'C'/lc_monetary = '`pg_getlocale MONETARY`'/" \ -e "s/^#lc_numeric = 'C'/lc_numeric = '`pg_getlocale NUMERIC`'/" \ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 3093de0f88..d5d6d85c62 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.132 2003/08/04 04:03:10 tgl Exp $ + * $Id: miscadmin.h,v 1.133 2003/08/26 15:38:25 tgl Exp $ * * NOTES * some of the information in this file should be moved to @@ -191,17 +191,12 @@ extern int VacuumMem; * A few postmaster startup options are exported here so the * configuration file processor can access them. */ - extern bool NetServer; extern bool EnableSSL; extern bool SilentMode; extern int MaxBackends; - -#define DEF_MAXBACKENDS 32 extern int ReservedBackends; extern DLLIMPORT int NBuffers; - -#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) extern int PostPortNumber; extern int Unix_socket_permissions; extern char *Unix_socket_group;