diff options
| author | Tomas Vondra | 2019-10-05 18:49:39 +0000 |
|---|---|---|
| committer | Tomas Vondra | 2019-10-05 18:49:39 +0000 |
| commit | 36425ece5d6c78177cdc1453a9925a0bb85da59f (patch) | |
| tree | 57fd79f7b0c3a73364fe81cb2bea698a9de16875 | |
| parent | e800bd7414df3ce8170761e5b75b13e83f576988 (diff) | |
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
| -rw-r--r-- | src/backend/utils/mmgr/mcxt.c | 4 | ||||
| -rw-r--r-- | 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 7bbfabe0ea..d52bd2c073 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 6a837bc990..106c83da45 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, |