summaryrefslogtreecommitdiff
path: root/src/backend/utils/mmgr
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/mmgr')
-rw-r--r--src/backend/utils/mmgr/aset.c18
-rw-r--r--src/backend/utils/mmgr/generation.c16
-rw-r--r--src/backend/utils/mmgr/mcxt.c50
-rw-r--r--src/backend/utils/mmgr/portalmem.c12
-rw-r--r--src/backend/utils/mmgr/slab.c16
5 files changed, 56 insertions, 56 deletions
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index db402e3a416..b6a8bbcd596 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -544,7 +544,7 @@ AllocSetReset(MemoryContext context)
AllocBlock block;
Size keepersize PG_USED_FOR_ASSERTS_ONLY;
- AssertArg(AllocSetIsValid(set));
+ Assert(AllocSetIsValid(set));
#ifdef MEMORY_CONTEXT_CHECKING
/* Check for corruption and leaks before freeing */
@@ -614,7 +614,7 @@ AllocSetDelete(MemoryContext context)
AllocBlock block = set->blocks;
Size keepersize PG_USED_FOR_ASSERTS_ONLY;
- AssertArg(AllocSetIsValid(set));
+ Assert(AllocSetIsValid(set));
#ifdef MEMORY_CONTEXT_CHECKING
/* Check for corruption and leaks before freeing */
@@ -713,7 +713,7 @@ AllocSetAlloc(MemoryContext context, Size size)
Size chunk_size;
Size blksize;
- AssertArg(AllocSetIsValid(set));
+ Assert(AllocSetIsValid(set));
/*
* If requested size exceeds maximum for chunks, allocate an entire block
@@ -1061,7 +1061,7 @@ AllocSetFree(void *pointer)
* Future field experience may show that these Asserts had better
* become regular runtime test-and-elog checks.
*/
- AssertArg(AllocBlockIsValid(block));
+ Assert(AllocBlockIsValid(block));
set = block->aset;
fidx = MemoryChunkGetValue(chunk);
@@ -1237,7 +1237,7 @@ AllocSetRealloc(void *pointer, Size size)
* field experience may show that these Asserts had better become regular
* runtime test-and-elog checks.
*/
- AssertArg(AllocBlockIsValid(block));
+ Assert(AllocBlockIsValid(block));
set = block->aset;
fidx = MemoryChunkGetValue(chunk);
@@ -1368,7 +1368,7 @@ AllocSetGetChunkContext(void *pointer)
else
block = (AllocBlock) MemoryChunkGetBlock(chunk);
- AssertArg(AllocBlockIsValid(block));
+ Assert(AllocBlockIsValid(block));
set = block->aset;
return &set->header;
@@ -1389,7 +1389,7 @@ AllocSetGetChunkSpace(void *pointer)
{
AllocBlock block = ExternalChunkGetBlock(chunk);
- AssertArg(AllocBlockIsValid(block));
+ Assert(AllocBlockIsValid(block));
return block->endptr - (char *) chunk;
}
@@ -1405,7 +1405,7 @@ AllocSetGetChunkSpace(void *pointer)
bool
AllocSetIsEmpty(MemoryContext context)
{
- AssertArg(AllocSetIsValid(context));
+ Assert(AllocSetIsValid(context));
/*
* For now, we say "empty" only if the context is new or just reset. We
@@ -1440,7 +1440,7 @@ AllocSetStats(MemoryContext context,
AllocBlock block;
int fidx;
- AssertArg(AllocSetIsValid(set));
+ Assert(AllocSetIsValid(set));
/* Include context header in totalspace */
totalspace = MAXALIGN(sizeof(AllocSetContext));
diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c
index 4cb75f493ff..b432a92be31 100644
--- a/src/backend/utils/mmgr/generation.c
+++ b/src/backend/utils/mmgr/generation.c
@@ -284,7 +284,7 @@ GenerationReset(MemoryContext context)
GenerationContext *set = (GenerationContext *) context;
dlist_mutable_iter miter;
- AssertArg(GenerationIsValid(set));
+ Assert(GenerationIsValid(set));
#ifdef MEMORY_CONTEXT_CHECKING
/* Check for corruption and leaks before freeing */
@@ -354,7 +354,7 @@ GenerationAlloc(MemoryContext context, Size size)
Size chunk_size;
Size required_size;
- AssertArg(GenerationIsValid(set));
+ Assert(GenerationIsValid(set));
#ifdef MEMORY_CONTEXT_CHECKING
/* ensure there's always space for the sentinel byte */
@@ -657,7 +657,7 @@ GenerationFree(void *pointer)
* block is good. Future field experience may show that this Assert
* had better become a regular runtime test-and-elog check.
*/
- AssertArg(GenerationBlockIsValid(block));
+ Assert(GenerationBlockIsValid(block));
#if defined(MEMORY_CONTEXT_CHECKING) || defined(CLOBBER_FREED_MEMORY)
chunksize = MemoryChunkGetValue(chunk);
@@ -769,7 +769,7 @@ GenerationRealloc(void *pointer, Size size)
* block is good. Future field experience may show that this Assert
* had better become a regular runtime test-and-elog check.
*/
- AssertArg(GenerationBlockIsValid(block));
+ Assert(GenerationBlockIsValid(block));
oldsize = MemoryChunkGetValue(chunk);
}
@@ -888,7 +888,7 @@ GenerationGetChunkContext(void *pointer)
else
block = (GenerationBlock *) MemoryChunkGetBlock(chunk);
- AssertArg(GenerationBlockIsValid(block));
+ Assert(GenerationBlockIsValid(block));
return &block->context->header;
}
@@ -907,7 +907,7 @@ GenerationGetChunkSpace(void *pointer)
{
GenerationBlock *block = ExternalChunkGetBlock(chunk);
- AssertArg(GenerationBlockIsValid(block));
+ Assert(GenerationBlockIsValid(block));
chunksize = block->endptr - (char *) pointer;
}
else
@@ -926,7 +926,7 @@ GenerationIsEmpty(MemoryContext context)
GenerationContext *set = (GenerationContext *) context;
dlist_iter iter;
- AssertArg(GenerationIsValid(set));
+ Assert(GenerationIsValid(set));
dlist_foreach(iter, &set->blocks)
{
@@ -964,7 +964,7 @@ GenerationStats(MemoryContext context,
Size freespace = 0;
dlist_iter iter;
- AssertArg(GenerationIsValid(set));
+ Assert(GenerationIsValid(set));
/* Include context header in totalspace */
totalspace = MAXALIGN(sizeof(GenerationContext));
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 012517be5c5..f526ca82c15 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -258,7 +258,7 @@ BogusGetChunkSpace(void *pointer)
void
MemoryContextInit(void)
{
- AssertState(TopMemoryContext == NULL);
+ Assert(TopMemoryContext == NULL);
/*
* First, initialize TopMemoryContext, which is the parent of all others.
@@ -302,7 +302,7 @@ MemoryContextInit(void)
void
MemoryContextReset(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/* save a function call in common case where there are no children */
if (context->firstchild != NULL)
@@ -321,7 +321,7 @@ MemoryContextReset(MemoryContext context)
void
MemoryContextResetOnly(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/* Nothing to do if no pallocs since startup or last reset */
if (!context->isReset)
@@ -354,7 +354,7 @@ MemoryContextResetChildren(MemoryContext context)
{
MemoryContext child;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
for (child = context->firstchild; child != NULL; child = child->nextchild)
{
@@ -375,7 +375,7 @@ MemoryContextResetChildren(MemoryContext context)
void
MemoryContextDelete(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/* We had better not be deleting TopMemoryContext ... */
Assert(context != TopMemoryContext);
/* And not CurrentMemoryContext, either */
@@ -420,7 +420,7 @@ MemoryContextDelete(MemoryContext context)
void
MemoryContextDeleteChildren(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/*
* MemoryContextDelete will delink the child from me, so just iterate as
@@ -450,7 +450,7 @@ void
MemoryContextRegisterResetCallback(MemoryContext context,
MemoryContextCallback *cb)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/* Push onto head so this will be called before older registrants. */
cb->next = context->reset_cbs;
@@ -493,7 +493,7 @@ MemoryContextCallResetCallbacks(MemoryContext context)
void
MemoryContextSetIdentifier(MemoryContext context, const char *id)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
context->ident = id;
}
@@ -518,8 +518,8 @@ MemoryContextSetIdentifier(MemoryContext context, const char *id)
void
MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
{
- AssertArg(MemoryContextIsValid(context));
- AssertArg(context != new_parent);
+ Assert(MemoryContextIsValid(context));
+ Assert(context != new_parent);
/* Fast path if it's got correct parent already */
if (new_parent == context->parent)
@@ -545,7 +545,7 @@ MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
/* And relink */
if (new_parent)
{
- AssertArg(MemoryContextIsValid(new_parent));
+ Assert(MemoryContextIsValid(new_parent));
context->parent = new_parent;
context->prevchild = NULL;
context->nextchild = new_parent->firstchild;
@@ -575,7 +575,7 @@ MemoryContextSetParent(MemoryContext context, MemoryContext new_parent)
void
MemoryContextAllowInCriticalSection(MemoryContext context, bool allow)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
context->allowInCritSection = allow;
}
@@ -612,7 +612,7 @@ GetMemoryChunkSpace(void *pointer)
MemoryContext
MemoryContextGetParent(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
return context->parent;
}
@@ -624,7 +624,7 @@ MemoryContextGetParent(MemoryContext context)
bool
MemoryContextIsEmpty(MemoryContext context)
{
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/*
* For now, we consider a memory context nonempty if it has any children;
@@ -645,7 +645,7 @@ MemoryContextMemAllocated(MemoryContext context, bool recurse)
{
Size total = context->mem_allocated;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
if (recurse)
{
@@ -737,7 +737,7 @@ MemoryContextStatsInternal(MemoryContext context, int level,
MemoryContext child;
int ichild;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
/* Examine the context itself */
context->methods->stats(context,
@@ -902,7 +902,7 @@ MemoryContextCheck(MemoryContext context)
{
MemoryContext child;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
context->methods->check(context);
for (child = context->firstchild; child != NULL; child = child->nextchild)
@@ -995,7 +995,7 @@ MemoryContextAlloc(MemoryContext context, Size size)
{
void *ret;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1038,7 +1038,7 @@ MemoryContextAllocZero(MemoryContext context, Size size)
{
void *ret;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1076,7 +1076,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size)
{
void *ret;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1111,7 +1111,7 @@ MemoryContextAllocExtended(MemoryContext context, Size size, int flags)
{
void *ret;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!((flags & MCXT_ALLOC_HUGE) != 0 ? AllocHugeSizeIsValid(size) :
@@ -1202,7 +1202,7 @@ palloc(Size size)
void *ret;
MemoryContext context = CurrentMemoryContext;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1233,7 +1233,7 @@ palloc0(Size size)
void *ret;
MemoryContext context = CurrentMemoryContext;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocSizeIsValid(size))
@@ -1266,7 +1266,7 @@ palloc_extended(Size size, int flags)
void *ret;
MemoryContext context = CurrentMemoryContext;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!((flags & MCXT_ALLOC_HUGE) != 0 ? AllocHugeSizeIsValid(size) :
@@ -1406,7 +1406,7 @@ MemoryContextAllocHuge(MemoryContext context, Size size)
{
void *ret;
- AssertArg(MemoryContextIsValid(context));
+ Assert(MemoryContextIsValid(context));
AssertNotInCriticalSection(context);
if (!AllocHugeSizeIsValid(size))
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index c3e95346b60..7b1ae6fdcf0 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -177,7 +177,7 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)
{
Portal portal;
- AssertArg(PointerIsValid(name));
+ Assert(PointerIsValid(name));
portal = GetPortalByName(name);
if (PortalIsValid(portal))
@@ -287,11 +287,11 @@ PortalDefineQuery(Portal portal,
List *stmts,
CachedPlan *cplan)
{
- AssertArg(PortalIsValid(portal));
- AssertState(portal->status == PORTAL_NEW);
+ Assert(PortalIsValid(portal));
+ Assert(portal->status == PORTAL_NEW);
- AssertArg(sourceText != NULL);
- AssertArg(commandTag != CMDTAG_UNKNOWN || stmts == NIL);
+ Assert(sourceText != NULL);
+ Assert(commandTag != CMDTAG_UNKNOWN || stmts == NIL);
portal->prepStmtName = prepStmtName;
portal->sourceText = sourceText;
@@ -468,7 +468,7 @@ MarkPortalFailed(Portal portal)
void
PortalDrop(Portal portal, bool isTopCommit)
{
- AssertArg(PortalIsValid(portal));
+ Assert(PortalIsValid(portal));
/*
* Don't allow dropping a pinned portal, it's still needed by whoever
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 1a0b28f9ea1..6df0839b6ac 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -254,7 +254,7 @@ SlabReset(MemoryContext context)
SlabContext *slab = (SlabContext *) context;
int i;
- AssertArg(SlabIsValid(slab));
+ Assert(SlabIsValid(slab));
#ifdef MEMORY_CONTEXT_CHECKING
/* Check for corruption and leaks before freeing */
@@ -313,7 +313,7 @@ SlabAlloc(MemoryContext context, Size size)
MemoryChunk *chunk;
int idx;
- AssertArg(SlabIsValid(slab));
+ Assert(SlabIsValid(slab));
Assert((slab->minFreeChunks >= 0) &&
(slab->minFreeChunks < slab->chunksPerBlock));
@@ -475,7 +475,7 @@ SlabFree(void *pointer)
* Future field experience may show that this Assert had better become a
* regular runtime test-and-elog check.
*/
- AssertArg(SlabBlockIsValid(block));
+ Assert(SlabBlockIsValid(block));
slab = block->slab;
#ifdef MEMORY_CONTEXT_CHECKING
@@ -593,7 +593,7 @@ SlabGetChunkContext(void *pointer)
MemoryChunk *chunk = PointerGetMemoryChunk(pointer);
SlabBlock *block = MemoryChunkGetBlock(chunk);
- AssertArg(SlabBlockIsValid(block));
+ Assert(SlabBlockIsValid(block));
return &block->slab->header;
}
@@ -609,7 +609,7 @@ SlabGetChunkSpace(void *pointer)
SlabBlock *block = MemoryChunkGetBlock(chunk);
SlabContext *slab;
- AssertArg(SlabBlockIsValid(block));
+ Assert(SlabBlockIsValid(block));
slab = block->slab;
return slab->fullChunkSize;
@@ -624,7 +624,7 @@ SlabIsEmpty(MemoryContext context)
{
SlabContext *slab = (SlabContext *) context;
- AssertArg(SlabIsValid(slab));
+ Assert(SlabIsValid(slab));
return (slab->nblocks == 0);
}
@@ -651,7 +651,7 @@ SlabStats(MemoryContext context,
Size freespace = 0;
int i;
- AssertArg(SlabIsValid(slab));
+ Assert(SlabIsValid(slab));
/* Include context header in totalspace */
totalspace = slab->headerSize;
@@ -709,7 +709,7 @@ SlabCheck(MemoryContext context)
int i;
const char *name = slab->header.name;
- AssertArg(SlabIsValid(slab));
+ Assert(SlabIsValid(slab));
Assert(slab->chunksPerBlock > 0);
/* walk all the freelists */
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-08 20:33:27 +0000