From dab8da805820947a3d82ae84c17feccd9df8171b Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 12 Jun 1999 22:17:24 +0000 Subject: [PATCH] Move default NBuffers setting into config.h, and rename it to DEF_NBUFFERS for readability. Make sure the default value is OK according to postmaster.c's new sanity check for -B values. --- src/backend/storage/buffer/buf_init.c | 2 +- src/include/config.h.in | 9 +++++++++ src/include/miscadmin.h | 6 ------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index b8dddcf8e8..50f01635df 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -50,7 +50,7 @@ long *CurTraceBuf; #endif /* BMTRACE */ int ShowPinTrace = 0; -int NBuffers = NDBUFS; /* NDBUFS defined in miscadmin.h */ +int NBuffers = DEF_NBUFFERS; /* default is set in config.h */ int Data_Descriptors; int Free_List_Descriptor; int Lookup_List_Descriptor; diff --git a/src/include/config.h.in b/src/include/config.h.in index 9afb5e251f..20e5e5c377 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -21,6 +21,15 @@ */ #define MAXBACKENDS (DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024) +/* + * Default number of buffers in shared buffer pool (each of size BLCKSZ). + * This is just the default setting for the postmaster's -B switch. + * Perhaps it ought to be configurable from a configure switch. + * NOTE: default setting corresponds to the minimum number of buffers + * that postmaster.c will allow for the default MaxBackends value. + */ +#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) + /* * Size of a disk block --- currently, this limits the size of a tuple. * You can set it bigger if you need bigger tuples. diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 60ce631d15..26b261ce6e 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -102,12 +102,6 @@ extern Oid LastOidProcessed; /* for query rewrite */ /* #define MAX_QUERY_SIZE (BLCKSZ*2) */ #define MAX_PARSE_BUFFER MAX_QUERY_SIZE -/* - * default number of buffers in buffer pool - * - */ -#define NDBUFS 64 - /***************************************************************************** * pdir.h -- * * POSTGRES directory path definitions. * -- 2.39.5