Add some more Assert checks.

tglsfdc · tglsfdc · commit 94e90d9a86a1 · 2000-08-22T04:00:10.000Z
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.23 2000/07/11 14:30:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.24 2000/08/22 04:00:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -114,6 +114,8 @@ MemoryContextInit(void)
 void
 MemoryContextReset(MemoryContext context)
 {
+	AssertArg(MemoryContextIsValid(context));
+
 	MemoryContextResetChildren(context);
 	(*context->methods->reset) (context);
 }
@@ -129,6 +131,8 @@ MemoryContextResetChildren(MemoryContext context)
 {
 	MemoryContext	child;
 
+	AssertArg(MemoryContextIsValid(context));
+
 	for (child = context->firstchild; child != NULL; child = child->nextchild)
 	{
 		MemoryContextReset(child);
@@ -148,6 +152,7 @@ MemoryContextResetChildren(MemoryContext context)
 void
 MemoryContextDelete(MemoryContext context)
 {
+	AssertArg(MemoryContextIsValid(context));
 	/* We had better not be deleting TopMemoryContext ... */
 	Assert(context != TopMemoryContext);
 	/* And not CurrentMemoryContext, either */
@@ -194,6 +199,7 @@ MemoryContextDelete(MemoryContext context)
 void
 MemoryContextDeleteChildren(MemoryContext context)
 {
+	AssertArg(MemoryContextIsValid(context));
 	/*
 	 * MemoryContextDelete will delink the child from me,
 	 * so just iterate as long as there is a child.
@@ -215,6 +221,8 @@ MemoryContextDeleteChildren(MemoryContext context)
 void
 MemoryContextResetAndDeleteChildren(MemoryContext context)
 {
+	AssertArg(MemoryContextIsValid(context));
+
 	MemoryContextDeleteChildren(context);
 	(*context->methods->reset) (context);
 }
@@ -231,6 +239,8 @@ MemoryContextStats(MemoryContext context)
 {
 	MemoryContext	child;
 
+	AssertArg(MemoryContextIsValid(context));
+
 	(*context->methods->stats) (context);
 	for (child = context->firstchild; child != NULL; child = child->nextchild)
 	{
@@ -251,6 +261,8 @@ MemoryContextCheck(MemoryContext context)
 {
 	MemoryContext	child;
 
+	AssertArg(MemoryContextIsValid(context));
+
 	(*context->methods->check) (context);
 	for (child = context->firstchild; child != NULL; child = child->nextchild)
 	{

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.23 2000/07/11 14:30:28 momjian Exp $`
	`17`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.24 2000/08/22 04:00:10 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -114,6 +114,8 @@ MemoryContextInit(void)`
`114`	`114`	`void`
`115`	`115`	`MemoryContextReset(MemoryContext context)`
`116`	`116`	`{`
	`117`	`+ AssertArg(MemoryContextIsValid(context));`
	`118`	`+`
`117`	`119`	`MemoryContextResetChildren(context);`
`118`	`120`	`(*context->methods->reset) (context);`
`119`	`121`	`}`
`@@ -129,6 +131,8 @@ MemoryContextResetChildren(MemoryContext context)`
`129`	`131`	`{`
`130`	`132`	`MemoryContext child;`
`131`	`133`
	`134`	`+ AssertArg(MemoryContextIsValid(context));`
	`135`	`+`
`132`	`136`	`for (child = context->firstchild; child != NULL; child = child->nextchild)`
`133`	`137`	`{`
`134`	`138`	`MemoryContextReset(child);`
`@@ -148,6 +152,7 @@ MemoryContextResetChildren(MemoryContext context)`
`148`	`152`	`void`
`149`	`153`	`MemoryContextDelete(MemoryContext context)`
`150`	`154`	`{`
	`155`	`+ AssertArg(MemoryContextIsValid(context));`
`151`	`156`	`/* We had better not be deleting TopMemoryContext ... */`
`152`	`157`	`Assert(context != TopMemoryContext);`
`153`	`158`	`/* And not CurrentMemoryContext, either */`
`@@ -194,6 +199,7 @@ MemoryContextDelete(MemoryContext context)`
`194`	`199`	`void`
`195`	`200`	`MemoryContextDeleteChildren(MemoryContext context)`
`196`	`201`	`{`
	`202`	`+ AssertArg(MemoryContextIsValid(context));`
`197`	`203`	`/*`
`198`	`204`	`* MemoryContextDelete will delink the child from me,`
`199`	`205`	`* so just iterate as long as there is a child.`
`@@ -215,6 +221,8 @@ MemoryContextDeleteChildren(MemoryContext context)`
`215`	`221`	`void`
`216`	`222`	`MemoryContextResetAndDeleteChildren(MemoryContext context)`
`217`	`223`	`{`
	`224`	`+ AssertArg(MemoryContextIsValid(context));`
	`225`	`+`
`218`	`226`	`MemoryContextDeleteChildren(context);`
`219`	`227`	`(*context->methods->reset) (context);`
`220`	`228`	`}`
`@@ -231,6 +239,8 @@ MemoryContextStats(MemoryContext context)`
`231`	`239`	`{`
`232`	`240`	`MemoryContext child;`
`233`	`241`
	`242`	`+ AssertArg(MemoryContextIsValid(context));`
	`243`	`+`
`234`	`244`	`(*context->methods->stats) (context);`
`235`	`245`	`for (child = context->firstchild; child != NULL; child = child->nextchild)`
`236`	`246`	`{`
`@@ -251,6 +261,8 @@ MemoryContextCheck(MemoryContext context)`
`251`	`261`	`{`
`252`	`262`	`MemoryContext child;`
`253`	`263`
	`264`	`+ AssertArg(MemoryContextIsValid(context));`
	`265`	`+`
`254`	`266`	`(*context->methods->check) (context);`
`255`	`267`	`for (child = context->firstchild; child != NULL; child = child->nextchild)`
`256`	`268`	`{`