Prevent BLCKSZ < 1024, and have initdb test shared buffers based on the

bmomjian · bmomjian · commit 272b6ef20d76 · 2007-02-20T23:49:38.000Z
BLCKSZ value.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.134 2007/02/20 23:49:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1208,7 +1208,8 @@ test_config_settings(void)
 
 	for (i = 0; i < bufslen; i++)
 	{
-		test_buffs = trial_bufs[i];
+		/* Use same amount of memory, independent of BLCKSZ */
+		test_buffs = (trial_bufs[i] * 8192) / BLCKSZ;
 		if (test_buffs <= ok_buffers)
 		{
 			test_buffs = ok_buffers;
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
@@ -6,7 +6,7 @@
  * for developers.	If you edit any of these, be sure to do a *full*
  * rebuild (and an initdb if noted).
  *
- * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.24 2007/02/06 09:16:08 petere Exp $
+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.25 2007/02/20 23:49:38 momjian Exp $
  *------------------------------------------------------------------------
  */
 
@@ -25,6 +25,10 @@
  */
 #define BLCKSZ	8192
 
+#if BLCKSZ < 1024
+#error BLCKSZ must be >= 1024
+#endif
+
 /*
  * RELSEG_SIZE is the maximum number of blocks allowed in one disk
  * file.  Thus, the maximum size of a single file is RELSEG_SIZE *

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.134 2007/02/20 23:49:38 momjian Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -1208,7 +1208,8 @@ test_config_settings(void)`
`1208`	`1208`
`1209`	`1209`	`for (i = 0; i < bufslen; i++)`
`1210`	`1210`	`{`
`1211`		`- test_buffs = trial_bufs[i];`
	`1211`	`+ /* Use same amount of memory, independent of BLCKSZ */`
	`1212`	`+ test_buffs = (trial_bufs[i] * 8192) / BLCKSZ;`
`1212`	`1213`	`if (test_buffs <= ok_buffers)`
`1213`	`1214`	`{`
`1214`	`1215`	`test_buffs = ok_buffers;`