Commit642d21a

committed

Move default NBuffers setting into config.h, and rename it

to DEF_NBUFFERS for readability. Make sure the default value is OKaccording to postmaster.c's new sanity check for -B values.

1 parentd9e223d commit642d21aCopy full SHA for 642d21a

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.23 1999/05/25 16:10:56 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.24 1999/06/12 22:17:24 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -50,7 +50,7 @@ long *CurTraceBuf;`
`50`	`50`	`#endif/* BMTRACE */`
`51`	`51`	`intShowPinTrace=0;`
`52`	`52`
`53`		`-intNBuffers=NDBUFS;/NDBUFS definedinmiscadmin.h /`
	`53`	`+intNBuffers=DEF_NBUFFERS;/default is setinconfig.h /`
`54`	`54`	`intData_Descriptors;`
`55`	`55`	`intFree_List_Descriptor;`
`56`	`56`	`intLookup_List_Descriptor;`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,15 @@`
`21`	`21`	`*/`
`22`	`22`	`#defineMAXBACKENDS(DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024)`
`23`	`23`
	`24`	`+/*`
	`25`	`+ * Default number of buffers in shared buffer pool (each of size BLCKSZ).`
	`26`	`+ * This is just the default setting for the postmaster's -B switch.`
	`27`	`+ * Perhaps it ought to be configurable from a configure switch.`
	`28`	`+ * NOTE: default setting corresponds to the minimum number of buffers`
	`29`	`+ * that postmaster.c will allow for the default MaxBackends value.`
	`30`	`+ */`
	`31`	`+#defineDEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16)`
	`32`	`+`
`24`	`33`	`/*`
`25`	`34`	`* Size of a disk block --- currently, this limits the size of a tuple.`
`26`	`35`	`* You can set it bigger if you need bigger tuples.`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`* Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $Id: miscadmin.h,v 1.39 1999/05/25 16:13:23momjian Exp $`
	`14`	`+ * $Id: miscadmin.h,v 1.40 1999/06/12 22:17:23tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* some of the information in this file will be moved to`
`@@ -102,12 +102,6 @@ extern OidLastOidProcessed;/* for query rewrite */`
`102`	`102`	`/* #define MAX_QUERY_SIZE (BLCKSZ2) /`
`103`	`103`	`#defineMAX_PARSE_BUFFER MAX_QUERY_SIZE`
`104`	`104`
`105`		`-/*`
`106`		`- *default number of buffers in buffer pool`
`107`		`- *`
`108`		`- */`
`109`		`-#defineNDBUFS 64`
`110`		`-`
`111`	`105`	`/*****************************************************************************`
`112`	`106`	`* pdir.h -- *`
`113`	`107`	`POSTGRES directory path definitions. `

Comments

(0)