Avoid useless loop overhead in AtEOXact routines when the backend is

tglsfdc · tglsfdc · commit 15269b59552b · 2005-08-08T19:44:22.000Z
compiled with USE_ASSERT_CHECKING but is running with assert_enabled false.
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.191 2005/08/08 03:11:44 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.192 2005/08/08 19:44:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1067,15 +1067,18 @@ void
 AtEOXact_Buffers(bool isCommit)
 {
 #ifdef USE_ASSERT_CHECKING
-	int			i;
-
-	for (i = 0; i < NBuffers; i++)
+	if (assert_enabled)
 	{
-		Assert(PrivateRefCount[i] == 0);
+		int			i;
+
+		for (i = 0; i < NBuffers; i++)
+		{
+			Assert(PrivateRefCount[i] == 0);
+		}
 	}
+#endif
 
 	AtEOXact_LocalBuffers(isCommit);
-#endif
 
 	/* Make sure we reset the strategy hint in case VACUUM errored out */
 	StrategyHintVacuum(false);
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.67 2005/05/29 04:23:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.68 2005/08/08 19:44:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -308,11 +308,14 @@ void
 AtEOXact_LocalBuffers(bool isCommit)
 {
 #ifdef USE_ASSERT_CHECKING
-	int			i;
-
-	for (i = 0; i < NLocBuffer; i++)
+	if (assert_enabled)
 	{
-		Assert(LocalRefCount[i] == 0);
+		int			i;
+
+		for (i = 0; i < NLocBuffer; i++)
+		{
+			Assert(LocalRefCount[i] == 0);
+		}
 	}
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.191 2005/08/08 03:11:44 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.192 2005/08/08 19:44:22 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1067,15 +1067,18 @@ void`
`1067`	`1067`	`AtEOXact_Buffers(bool isCommit)`
`1068`	`1068`	`{`
`1069`	`1069`	`#ifdef USE_ASSERT_CHECKING`
`1070`		`- int i;`
`1071`		`-`
`1072`		`- for (i = 0; i < NBuffers; i++)`
	`1070`	`+ if (assert_enabled)`
`1073`	`1071`	`{`
`1074`		`- Assert(PrivateRefCount[i] == 0);`
	`1072`	`+ int i;`
	`1073`	`+`
	`1074`	`+ for (i = 0; i < NBuffers; i++)`
	`1075`	`+ {`
	`1076`	`+ Assert(PrivateRefCount[i] == 0);`
	`1077`	`+ }`
`1075`	`1078`	`}`
	`1079`	`+#endif`
`1076`	`1080`
`1077`	`1081`	`AtEOXact_LocalBuffers(isCommit);`
`1078`		`-#endif`
`1079`	`1082`
`1080`	`1083`	`/* Make sure we reset the strategy hint in case VACUUM errored out */`
`1081`	`1084`	`StrategyHintVacuum(false);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.67 2005/05/29 04:23:04 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.68 2005/08/08 19:44:22 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -308,11 +308,14 @@ void`
`308`	`308`	`AtEOXact_LocalBuffers(bool isCommit)`
`309`	`309`	`{`
`310`	`310`	`#ifdef USE_ASSERT_CHECKING`
`311`		`- int i;`
`312`		`-`
`313`		`- for (i = 0; i < NLocBuffer; i++)`
	`311`	`+ if (assert_enabled)`
`314`	`312`	`{`
`315`		`- Assert(LocalRefCount[i] == 0);`
	`313`	`+ int i;`
	`314`	`+`
	`315`	`+ for (i = 0; i < NLocBuffer; i++)`
	`316`	`+ {`
	`317`	`+ Assert(LocalRefCount[i] == 0);`
	`318`	`+ }`
`316`	`319`	`}`
`317`	`320`	`#endif`
`318`	`321`	`}`