From 36425ece5d6c78177cdc1453a9925a0bb85da59f Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Sat, 5 Oct 2019 20:49:39 +0200 Subject: [PATCH] Change MemoryContextMemAllocated to return Size Commit f2369bc610 switched most of the memory accounting from int64 to Size, but it forgot to change the MemoryContextMemAllocated return type. So this fixes that omission. Discussion: https://www.postgresql.org/message-id/11238.1570200198%40sss.pgh.pa.us --- src/backend/utils/mmgr/mcxt.c | 4 ++-- src/include/utils/memutils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 7bbfabe0eab..d52bd2c073c 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -466,10 +466,10 @@ MemoryContextIsEmpty(MemoryContext context) * Find the memory allocated to blocks for this memory context. If recurse is * true, also include children. */ -int64 +Size MemoryContextMemAllocated(MemoryContext context, bool recurse) { - int64 total = context->mem_allocated; + Size total = context->mem_allocated; AssertArg(MemoryContextIsValid(context)); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 6a837bc9902..106c83da45f 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -82,7 +82,7 @@ extern void MemoryContextSetParent(MemoryContext context, extern Size GetMemoryChunkSpace(void *pointer); extern MemoryContext MemoryContextGetParent(MemoryContext context); extern bool MemoryContextIsEmpty(MemoryContext context); -extern int64 MemoryContextMemAllocated(MemoryContext context, bool recurse); +extern Size MemoryContextMemAllocated(MemoryContext context, bool recurse); extern void MemoryContextStats(MemoryContext context); extern void MemoryContextStatsDetail(MemoryContext context, int max_children); extern void MemoryContextAllowInCriticalSection(MemoryContext context,