Re: Rethinking MemoryContext creation - Mailing list pgsql-hackers
| From | Tom Lane |
|---|---|
| Subject | Re: Rethinking MemoryContext creation |
| Date | |
| Msg-id | 26282.1513021859@sss.pgh.pa.us Whole thread Raw |
| In response to | Re: Rethinking MemoryContext creation (Robert Haas <robertmhaas@gmail.com>) |
| Responses |
Re: Rethinking MemoryContext creation
|
| List | pgsql-hackers |
Robert Haas <robertmhaas@gmail.com> writes:
> On Mon, Dec 11, 2017 at 12:36 PM, Tom Lane <tgl@sss.pgh.pa.us> wrote:
>> [ thinks... ] If we wanted to go that way, one thing we could do to
>> help extension authors (and ourselves) is to define the proposed
>> AllocSetContextCreate macro to include
>>
>> StaticAssertExpr(__builtin_constant_p(name))
>>
>> on compilers that have __builtin_constant_p. Now, that only helps
>> people using gcc and gcc-alikes, but that's a large fraction of
>> developers I should think. (I tested this and it does seem to
>> correctly recognize string literals as constants.)
> I like that idea. I think that would provide good protection not only
> for third-party developers but for core developers.
It turns out this is slightly more painful than I'd anticipated.
I tried to #define AllocSetContextCreate with five parameters,
but all of the call sites that use the size abstraction macros
(ALLOCSET_DEFAULT_SIZES and friends) blew up, because as far as
they were concerned there were only three parameters, since the
abstraction macros hadn't gotten expanded yet.
We can make it work by #defining AllocSetContextCreate with three
parameters
#define AllocSetContextCreate(parent, name, allocparams) ...
This approach means that you *must* use an abstraction macro when going
through AllocSetContextCreate; if you want to write out the parameters
longhand, you have to call AllocSetContextCreateExtended. I do not
feel that this is a big loss, but there were half a dozen sites in our
code that were doing it the old way. More significantly, since we
only introduced those macros in 9.6, I suspect that most extensions
are still doing it the old way and will get broken by this change.
It's not hard to fix, but the annoyance factor will probably be real.
I see no good way around it though: we can't use a static inline
function instead, because that will almost certainly break the
__builtin_constant_p test.
I did not bother with compatibility macros for SlabContext or
GenerationContext --- I really doubt any extension code is using
the former yet, and they couldn't be using the latter since it's new.
I've not done any benchmarking on this yet, just confirmed that it
compiles and passes check-world.
regards, tom lane
diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index 868c14e..adbbc44 100644
*** a/contrib/amcheck/verify_nbtree.c
--- b/contrib/amcheck/verify_nbtree.c
*************** bt_check_every_level(Relation rel, bool
*** 295,303 ****
/* Create context for page */
state->targetcontext = AllocSetContextCreate(CurrentMemoryContext,
"amcheck context",
! ALLOCSET_DEFAULT_MINSIZE,
! ALLOCSET_DEFAULT_INITSIZE,
! ALLOCSET_DEFAULT_MAXSIZE);
state->checkstrategy = GetAccessStrategy(BAS_BULKREAD);
/* Get true root block from meta-page */
--- 295,301 ----
/* Create context for page */
state->targetcontext = AllocSetContextCreate(CurrentMemoryContext,
"amcheck context",
! ALLOCSET_DEFAULT_SIZES);
state->checkstrategy = GetAccessStrategy(BAS_BULKREAD);
/* Get true root block from meta-page */
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 046898c..e93d740 100644
*** a/src/backend/access/transam/xact.c
--- b/src/backend/access/transam/xact.c
*************** AtStart_Memory(void)
*** 997,1007 ****
*/
if (TransactionAbortContext == NULL)
TransactionAbortContext =
! AllocSetContextCreate(TopMemoryContext,
! "TransactionAbortContext",
! 32 * 1024,
! 32 * 1024,
! 32 * 1024);
/*
* We shouldn't have a transaction context already.
--- 997,1008 ----
*/
if (TransactionAbortContext == NULL)
TransactionAbortContext =
! AllocSetContextCreateExtended(TopMemoryContext,
! "TransactionAbortContext",
! 0,
! 32 * 1024,
! 32 * 1024,
! 32 * 1024);
/*
* We shouldn't have a transaction context already.
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index dd4a8d3..6e27856 100644
*** a/src/backend/catalog/partition.c
--- b/src/backend/catalog/partition.c
*************** RelationBuildPartitionDesc(Relation rel)
*** 513,521 ****
}
/* Now build the actual relcache partition descriptor */
! rel->rd_pdcxt = AllocSetContextCreate(CacheMemoryContext,
! RelationGetRelationName(rel),
! ALLOCSET_DEFAULT_SIZES);
oldcxt = MemoryContextSwitchTo(rel->rd_pdcxt);
result = (PartitionDescData *) palloc0(sizeof(PartitionDescData));
--- 513,522 ----
}
/* Now build the actual relcache partition descriptor */
! rel->rd_pdcxt = AllocSetContextCreateExtended(CacheMemoryContext,
! RelationGetRelationName(rel),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_DEFAULT_SIZES);
oldcxt = MemoryContextSwitchTo(rel->rd_pdcxt);
result = (PartitionDescData *) palloc0(sizeof(PartitionDescData));
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 086a6ef..a7f426d 100644
*** a/src/backend/commands/subscriptioncmds.c
--- b/src/backend/commands/subscriptioncmds.c
*************** publicationListToArray(List *publist)
*** 259,267 ****
/* Create memory context for temporary allocations. */
memcxt = AllocSetContextCreate(CurrentMemoryContext,
"publicationListToArray to array",
! ALLOCSET_DEFAULT_MINSIZE,
! ALLOCSET_DEFAULT_INITSIZE,
! ALLOCSET_DEFAULT_MAXSIZE);
oldcxt = MemoryContextSwitchTo(memcxt);
datums = (Datum *) palloc(sizeof(Datum) * list_length(publist));
--- 259,265 ----
/* Create memory context for temporary allocations. */
memcxt = AllocSetContextCreate(CurrentMemoryContext,
"publicationListToArray to array",
! ALLOCSET_DEFAULT_SIZES);
oldcxt = MemoryContextSwitchTo(memcxt);
datums = (Datum *) palloc(sizeof(Datum) * list_length(publist));
diff --git a/src/backend/lib/knapsack.c b/src/backend/lib/knapsack.c
index ddf2b9a..490c0cc 100644
*** a/src/backend/lib/knapsack.c
--- b/src/backend/lib/knapsack.c
*************** DiscreteKnapsack(int max_weight, int num
*** 57,65 ****
{
MemoryContext local_ctx = AllocSetContextCreate(CurrentMemoryContext,
"Knapsack",
! ALLOCSET_SMALL_MINSIZE,
! ALLOCSET_SMALL_INITSIZE,
! ALLOCSET_SMALL_MAXSIZE);
MemoryContext oldctx = MemoryContextSwitchTo(local_ctx);
double *values;
Bitmapset **sets;
--- 57,63 ----
{
MemoryContext local_ctx = AllocSetContextCreate(CurrentMemoryContext,
"Knapsack",
! ALLOCSET_SMALL_SIZES);
MemoryContext oldctx = MemoryContextSwitchTo(local_ctx);
double *values;
Bitmapset **sets;
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index a613ef4..24be3ce 100644
*** a/src/backend/replication/logical/launcher.c
--- b/src/backend/replication/logical/launcher.c
*************** ApplyLauncherMain(Datum main_arg)
*** 925,933 ****
/* Use temporary context for the database list and worker info. */
subctx = AllocSetContextCreate(TopMemoryContext,
"Logical Replication Launcher sublist",
! ALLOCSET_DEFAULT_MINSIZE,
! ALLOCSET_DEFAULT_INITSIZE,
! ALLOCSET_DEFAULT_MAXSIZE);
oldctx = MemoryContextSwitchTo(subctx);
/* search for subscriptions to start or stop. */
--- 925,931 ----
/* Use temporary context for the database list and worker info. */
subctx = AllocSetContextCreate(TopMemoryContext,
"Logical Replication Launcher sublist",
! ALLOCSET_DEFAULT_SIZES);
oldctx = MemoryContextSwitchTo(subctx);
/* search for subscriptions to start or stop. */
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index fa95bab..5ac391d 100644
*** a/src/backend/replication/logical/reorderbuffer.c
--- b/src/backend/replication/logical/reorderbuffer.c
*************** ReorderBufferAllocate(void)
*** 237,252 ****
--- 237,255 ----
buffer->change_context = SlabContextCreate(new_ctx,
"Change",
+ 0,
SLAB_DEFAULT_BLOCK_SIZE,
sizeof(ReorderBufferChange));
buffer->txn_context = SlabContextCreate(new_ctx,
"TXN",
+ 0,
SLAB_DEFAULT_BLOCK_SIZE,
sizeof(ReorderBufferTXN));
buffer->tup_context = GenerationContextCreate(new_ctx,
"Tuples",
+ 0,
SLAB_LARGE_BLOCK_SIZE);
hash_ctl.keysize = sizeof(TransactionId);
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index c312654..550b156 100644
*** a/src/backend/replication/pgoutput/pgoutput.c
--- b/src/backend/replication/pgoutput/pgoutput.c
*************** pgoutput_startup(LogicalDecodingContext
*** 152,160 ****
/* Create our memory context for private allocations. */
data->context = AllocSetContextCreate(ctx->context,
"logical replication output context",
! ALLOCSET_DEFAULT_MINSIZE,
! ALLOCSET_DEFAULT_INITSIZE,
! ALLOCSET_DEFAULT_MAXSIZE);
ctx->output_plugin_private = data;
--- 152,158 ----
/* Create our memory context for private allocations. */
data->context = AllocSetContextCreate(ctx->context,
"logical replication output context",
! ALLOCSET_DEFAULT_SIZES);
ctx->output_plugin_private = data;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 12a5f15..ca51a92 100644
*** a/src/backend/utils/cache/relcache.c
--- b/src/backend/utils/cache/relcache.c
*************** RelationBuildRuleLock(Relation relation)
*** 669,677 ****
/*
* Make the private context. Assume it'll not contain much data.
*/
! rulescxt = AllocSetContextCreate(CacheMemoryContext,
! RelationGetRelationName(relation),
! ALLOCSET_SMALL_SIZES);
relation->rd_rulescxt = rulescxt;
/*
--- 669,678 ----
/*
* Make the private context. Assume it'll not contain much data.
*/
! rulescxt = AllocSetContextCreateExtended(CacheMemoryContext,
! RelationGetRelationName(relation),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
relation->rd_rulescxt = rulescxt;
/*
*************** RelationBuildPartitionKey(Relation relat
*** 984,992 ****
ReleaseSysCache(tuple);
/* Success --- now copy to the cache memory */
! partkeycxt = AllocSetContextCreate(CacheMemoryContext,
! RelationGetRelationName(relation),
! ALLOCSET_SMALL_SIZES);
relation->rd_partkeycxt = partkeycxt;
oldcxt = MemoryContextSwitchTo(relation->rd_partkeycxt);
relation->rd_partkey = copy_partition_key(key);
--- 985,994 ----
ReleaseSysCache(tuple);
/* Success --- now copy to the cache memory */
! partkeycxt = AllocSetContextCreateExtended(CacheMemoryContext,
! RelationGetRelationName(relation),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
relation->rd_partkeycxt = partkeycxt;
oldcxt = MemoryContextSwitchTo(relation->rd_partkeycxt);
relation->rd_partkey = copy_partition_key(key);
*************** RelationInitIndexAccessInfo(Relation rel
*** 1566,1574 ****
* a context, and not just a couple of pallocs, is so that we won't leak
* any subsidiary info attached to fmgr lookup records.
*/
! indexcxt = AllocSetContextCreate(CacheMemoryContext,
! RelationGetRelationName(relation),
! ALLOCSET_SMALL_SIZES);
relation->rd_indexcxt = indexcxt;
/*
--- 1568,1577 ----
* a context, and not just a couple of pallocs, is so that we won't leak
* any subsidiary info attached to fmgr lookup records.
*/
! indexcxt = AllocSetContextCreateExtended(CacheMemoryContext,
! RelationGetRelationName(relation),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
relation->rd_indexcxt = indexcxt;
/*
*************** load_relcache_init_file(bool shared)
*** 5537,5545 ****
* prepare index info context --- parameters should match
* RelationInitIndexAccessInfo
*/
! indexcxt = AllocSetContextCreate(CacheMemoryContext,
! RelationGetRelationName(rel),
! ALLOCSET_SMALL_SIZES);
rel->rd_indexcxt = indexcxt;
/*
--- 5540,5550 ----
* prepare index info context --- parameters should match
* RelationInitIndexAccessInfo
*/
! indexcxt =
! AllocSetContextCreateExtended(CacheMemoryContext,
! RelationGetRelationName(rel),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
rel->rd_indexcxt = indexcxt;
/*
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index da5c8ea..3139b92 100644
*** a/src/backend/utils/cache/ts_cache.c
--- b/src/backend/utils/cache/ts_cache.c
*************** lookup_ts_dictionary_cache(Oid dictId)
*** 294,302 ****
Assert(!found); /* it wasn't there a moment ago */
/* Create private memory context the first time through */
! saveCtx = AllocSetContextCreate(CacheMemoryContext,
! NameStr(dict->dictname),
! ALLOCSET_SMALL_SIZES);
}
else
{
--- 294,303 ----
Assert(!found); /* it wasn't there a moment ago */
/* Create private memory context the first time through */
! saveCtx = AllocSetContextCreateExtended(CacheMemoryContext,
! NameStr(dict->dictname),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
}
else
{
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 71f5f06..b209433 100644
*** a/src/backend/utils/hash/dynahash.c
--- b/src/backend/utils/hash/dynahash.c
*************** hash_create(const char *tabname, long ne
*** 340,348 ****
CurrentDynaHashCxt = info->hcxt;
else
CurrentDynaHashCxt = TopMemoryContext;
! CurrentDynaHashCxt = AllocSetContextCreate(CurrentDynaHashCxt,
! tabname,
! ALLOCSET_DEFAULT_SIZES);
}
/* Initialize the hash header, plus a copy of the table name */
--- 340,350 ----
CurrentDynaHashCxt = info->hcxt;
else
CurrentDynaHashCxt = TopMemoryContext;
! CurrentDynaHashCxt =
! AllocSetContextCreateExtended(CurrentDynaHashCxt,
! tabname,
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_DEFAULT_SIZES);
}
/* Initialize the hash header, plus a copy of the table name */
diff --git a/src/backend/utils/mmgr/README b/src/backend/utils/mmgr/README
index 296fa19..a42e568 100644
*** a/src/backend/utils/mmgr/README
--- b/src/backend/utils/mmgr/README
*************** every other context is a direct or indir
*** 177,184 ****
here is essentially the same as "malloc", because this context will never
be reset or deleted. This is for stuff that should live forever, or for
stuff that the controlling module will take care of deleting at the
! appropriate time. An example is fd.c's tables of open files, as well as
! the context management nodes for memory contexts themselves. Avoid
allocating stuff here unless really necessary, and especially avoid
running with CurrentMemoryContext pointing here.
--- 177,183 ----
here is essentially the same as "malloc", because this context will never
be reset or deleted. This is for stuff that should live forever, or for
stuff that the controlling module will take care of deleting at the
! appropriate time. An example is fd.c's tables of open files. Avoid
allocating stuff here unless really necessary, and especially avoid
running with CurrentMemoryContext pointing here.
*************** a maximum block size. Selecting smaller
*** 420,430 ****
space in contexts that aren't expected to hold very much (an example
is the relcache's per-relation contexts).
! Also, it is possible to specify a minimum context size. If this
! value is greater than zero then a block of that size will be grabbed
! immediately upon context creation, and cleared but not released during
! context resets. This feature is needed for ErrorContext (see above),
! but will most likely not be used for other contexts.
We expect that per-tuple contexts will be reset frequently and typically
will not allocate very much space per tuple cycle. To make this usage
--- 419,428 ----
space in contexts that aren't expected to hold very much (an example
is the relcache's per-relation contexts).
! Also, it is possible to specify a minimum context size, in case for some
! reason that should be different from the initial size for additional
! blocks. An aset.c context will always contain at least one block,
! of size minContextSize if that is specified, otherwise initBlockSize.
We expect that per-tuple contexts will be reset frequently and typically
will not allocate very much space per tuple cycle. To make this usage
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 1bd1c34..61bd3aa 100644
*** a/src/backend/utils/mmgr/aset.c
--- b/src/backend/utils/mmgr/aset.c
*************** typedef void *AllocPointer;
*** 113,119 ****
*
* Note: header.isReset means there is nothing for AllocSetReset to do.
* This is different from the aset being physically empty (empty blocks list)
! * because we may still have a keeper block. It's also different from the set
* being logically empty, because we don't attempt to detect pfree'ing the
* last active chunk.
*/
--- 113,119 ----
*
* Note: header.isReset means there is nothing for AllocSetReset to do.
* This is different from the aset being physically empty (empty blocks list)
! * because we will still have a keeper block. It's also different from the set
* being logically empty, because we don't attempt to detect pfree'ing the
* last active chunk.
*/
*************** typedef struct AllocSetContext
*** 127,134 ****
Size initBlockSize; /* initial block size */
Size maxBlockSize; /* maximum block size */
Size nextBlockSize; /* next block size to allocate */
Size allocChunkLimit; /* effective chunk size limit */
! AllocBlock keeper; /* if not NULL, keep this block over resets */
} AllocSetContext;
typedef AllocSetContext *AllocSet;
--- 127,135 ----
Size initBlockSize; /* initial block size */
Size maxBlockSize; /* maximum block size */
Size nextBlockSize; /* next block size to allocate */
+ Size headerSize; /* allocated size of context header */
Size allocChunkLimit; /* effective chunk size limit */
! AllocBlock keeper; /* keep this block over resets */
} AllocSetContext;
typedef AllocSetContext *AllocSet;
*************** typedef struct AllocChunkData
*** 221,227 ****
static void *AllocSetAlloc(MemoryContext context, Size size);
static void AllocSetFree(MemoryContext context, void *pointer);
static void *AllocSetRealloc(MemoryContext context, void *pointer, Size size);
- static void AllocSetInit(MemoryContext context);
static void AllocSetReset(MemoryContext context);
static void AllocSetDelete(MemoryContext context);
static Size AllocSetGetChunkSpace(MemoryContext context, void *pointer);
--- 222,227 ----
*************** static void AllocSetCheck(MemoryContext
*** 236,246 ****
/*
* This is the virtual function table for AllocSet contexts.
*/
! static MemoryContextMethods AllocSetMethods = {
AllocSetAlloc,
AllocSetFree,
AllocSetRealloc,
- AllocSetInit,
AllocSetReset,
AllocSetDelete,
AllocSetGetChunkSpace,
--- 236,245 ----
/*
* This is the virtual function table for AllocSet contexts.
*/
! static const MemoryContextMethods AllocSetMethods = {
AllocSetAlloc,
AllocSetFree,
AllocSetRealloc,
AllocSetReset,
AllocSetDelete,
AllocSetGetChunkSpace,
*************** AllocSetFreeIndex(Size size)
*** 325,351 ****
/*
! * AllocSetContextCreate
* Create a new AllocSet context.
*
* parent: parent context, or NULL if top-level context
* name: name of context (for debugging only, need not be unique)
* minContextSize: minimum context size
* initBlockSize: initial allocation block size
* maxBlockSize: maximum allocation block size
*
! * Notes: the name string will be copied into context-lifespan storage.
* Most callers should abstract the context size parameters using a macro
* such as ALLOCSET_DEFAULT_SIZES.
*/
MemoryContext
! AllocSetContextCreate(MemoryContext parent,
! const char *name,
! Size minContextSize,
! Size initBlockSize,
! Size maxBlockSize)
{
AllocSet set;
/* Assert we padded AllocChunkData properly */
StaticAssertStmt(ALLOC_CHUNKHDRSZ == MAXALIGN(ALLOC_CHUNKHDRSZ),
--- 324,357 ----
/*
! * AllocSetContextCreateExtended
* Create a new AllocSet context.
*
* parent: parent context, or NULL if top-level context
* name: name of context (for debugging only, need not be unique)
+ * flags: bitmask of MEMCONTEXT_OPTION_XXX flags
* minContextSize: minimum context size
* initBlockSize: initial allocation block size
* maxBlockSize: maximum allocation block size
*
! * Notes: if flags & MEMCONTEXT_OPTION_COPY_NAME, the name string will be
! * copied into context-lifespan storage; otherwise, it had better be
! * statically allocated.
* Most callers should abstract the context size parameters using a macro
* such as ALLOCSET_DEFAULT_SIZES.
*/
MemoryContext
! AllocSetContextCreateExtended(MemoryContext parent,
! const char *name,
! int flags,
! Size minContextSize,
! Size initBlockSize,
! Size maxBlockSize)
{
+ Size headerSize;
+ Size firstBlockSize;
AllocSet set;
+ AllocBlock block;
/* Assert we padded AllocChunkData properly */
StaticAssertStmt(ALLOC_CHUNKHDRSZ == MAXALIGN(ALLOC_CHUNKHDRSZ),
*************** AllocSetContextCreate(MemoryContext pare
*** 370,390 ****
maxBlockSize);
if (minContextSize != 0 &&
(minContextSize != MAXALIGN(minContextSize) ||
! minContextSize <= ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ))
elog(ERROR, "invalid minContextSize for memory context: %zu",
minContextSize);
! /* Do the type-independent part of context creation */
! set = (AllocSet) MemoryContextCreate(T_AllocSetContext,
! sizeof(AllocSetContext),
! &AllocSetMethods,
! parent,
! name);
- /* Save allocation parameters */
set->initBlockSize = initBlockSize;
set->maxBlockSize = maxBlockSize;
set->nextBlockSize = initBlockSize;
/*
* Compute the allocation chunk size limit for this context. It can't be
--- 376,440 ----
maxBlockSize);
if (minContextSize != 0 &&
(minContextSize != MAXALIGN(minContextSize) ||
! minContextSize < 1024 ||
! minContextSize > maxBlockSize))
elog(ERROR, "invalid minContextSize for memory context: %zu",
minContextSize);
! /* Size of the memory context header, including name storage if needed */
! if (flags & MEMCONTEXT_OPTION_COPY_NAME)
! headerSize = MAXALIGN(sizeof(AllocSetContext) + strlen(name) + 1);
! else
! headerSize = MAXALIGN(sizeof(AllocSetContext));
!
! /* Determine size of initial block */
! firstBlockSize = headerSize + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ;
! if (minContextSize != 0)
! firstBlockSize = Max(firstBlockSize, minContextSize);
! else
! firstBlockSize = Max(firstBlockSize, initBlockSize);
!
! /*
! * Allocate the initial block. Unlike other aset.c blocks, it starts with
! * the context header and its block header follows that.
! */
! set = (AllocSet) malloc(firstBlockSize);
! if (set == NULL)
! {
! MemoryContextStats(TopMemoryContext);
! ereport(ERROR,
! (errcode(ERRCODE_OUT_OF_MEMORY),
! errmsg("out of memory"),
! errdetail("Failed while creating memory context \"%s\".",
! name)));
! }
!
! /*
! * Avoid writing code that can fail between here and MemoryContextCreate;
! * we'd leak the initial block if we ereport in this stretch.
! */
!
! /* Fill in the initial block's block header */
! block = (AllocBlock) (((char *) set) + headerSize);
! block->aset = set;
! block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
! block->endptr = ((char *) set) + firstBlockSize;
! block->prev = NULL;
! block->next = NULL;
! set->blocks = block;
! /* Mark block as not to be released at reset time */
! set->keeper = block;
!
! /* Mark unallocated space NOACCESS; leave the block header alone. */
! VALGRIND_MAKE_MEM_NOACCESS(block->freeptr, block->endptr - block->freeptr);
!
! /* Finish filling in aset-specific parts of the context header */
! MemSetAligned(set->freelist, 0, sizeof(set->freelist));
set->initBlockSize = initBlockSize;
set->maxBlockSize = maxBlockSize;
set->nextBlockSize = initBlockSize;
+ set->headerSize = headerSize;
/*
* Compute the allocation chunk size limit for this context. It can't be
*************** AllocSetContextCreate(MemoryContext pare
*** 410,483 ****
(Size) ((maxBlockSize - ALLOC_BLOCKHDRSZ) / ALLOC_CHUNK_FRACTION))
set->allocChunkLimit >>= 1;
! /*
! * Grab always-allocated space, if requested
! */
! if (minContextSize > 0)
! {
! Size blksize = minContextSize;
! AllocBlock block;
!
! block = (AllocBlock) malloc(blksize);
! if (block == NULL)
! {
! MemoryContextStats(TopMemoryContext);
! ereport(ERROR,
! (errcode(ERRCODE_OUT_OF_MEMORY),
! errmsg("out of memory"),
! errdetail("Failed while creating memory context \"%s\".",
! name)));
! }
! block->aset = set;
! block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
! block->endptr = ((char *) block) + blksize;
! block->prev = NULL;
! block->next = set->blocks;
! if (block->next)
! block->next->prev = block;
! set->blocks = block;
! /* Mark block as not to be released at reset time */
! set->keeper = block;
!
! /* Mark unallocated space NOACCESS; leave the block header alone. */
! VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
! blksize - ALLOC_BLOCKHDRSZ);
! }
return (MemoryContext) set;
}
/*
- * AllocSetInit
- * Context-type-specific initialization routine.
- *
- * This is called by MemoryContextCreate() after setting up the
- * generic MemoryContext fields and before linking the new context
- * into the context tree. We must do whatever is needed to make the
- * new context minimally valid for deletion. We must *not* risk
- * failure --- thus, for example, allocating more memory is not cool.
- * (AllocSetContextCreate can allocate memory when it gets control
- * back, however.)
- */
- static void
- AllocSetInit(MemoryContext context)
- {
- /*
- * Since MemoryContextCreate already zeroed the context node, we don't
- * have to do anything here: it's already OK.
- */
- }
-
- /*
* AllocSetReset
* Frees all memory which is allocated in the given set.
*
* Actually, this routine has some discretion about what to do.
* It should mark all allocated chunks freed, but it need not necessarily
* give back all the resources the set owns. Our actual implementation is
! * that we hang onto any "keeper" block specified for the set. In this way,
! * we don't thrash malloc() when a context is repeatedly reset after small
! * allocations, which is typical behavior for per-tuple contexts.
*/
static void
AllocSetReset(MemoryContext context)
--- 460,489 ----
(Size) ((maxBlockSize - ALLOC_BLOCKHDRSZ) / ALLOC_CHUNK_FRACTION))
set->allocChunkLimit >>= 1;
! /* Finally, do the type-independent part of context creation */
! MemoryContextCreate((MemoryContext) set,
! T_AllocSetContext,
! headerSize,
! sizeof(AllocSetContext),
! &AllocSetMethods,
! parent,
! name,
! flags);
return (MemoryContext) set;
}
/*
* AllocSetReset
* Frees all memory which is allocated in the given set.
*
* Actually, this routine has some discretion about what to do.
* It should mark all allocated chunks freed, but it need not necessarily
* give back all the resources the set owns. Our actual implementation is
! * that we give back all but the "keeper" block (which we must keep, since
! * it also holds the context header). In this way, we don't thrash malloc()
! * when a context is repeatedly reset after small allocations, which is
! * typical behavior for per-tuple contexts.
*/
static void
AllocSetReset(MemoryContext context)
*************** AllocSetReset(MemoryContext context)
*** 497,503 ****
block = set->blocks;
! /* New blocks list is either empty or just the keeper block */
set->blocks = set->keeper;
while (block != NULL)
--- 503,509 ----
block = set->blocks;
! /* New blocks list will be just the keeper block */
set->blocks = set->keeper;
while (block != NULL)
*************** AllocSetReset(MemoryContext context)
*** 540,546 ****
* in preparation for deletion of the set.
*
* Unlike AllocSetReset, this *must* free all resources of the set.
- * But note we are not responsible for deleting the context node itself.
*/
static void
AllocSetDelete(MemoryContext context)
--- 546,551 ----
*************** AllocSetDelete(MemoryContext context)
*** 555,565 ****
AllocSetCheck(context);
#endif
! /* Make it look empty, just in case... */
! MemSetAligned(set->freelist, 0, sizeof(set->freelist));
! set->blocks = NULL;
! set->keeper = NULL;
!
while (block != NULL)
{
AllocBlock next = block->next;
--- 560,566 ----
AllocSetCheck(context);
#endif
! /* Free all blocks except the keeper */
while (block != NULL)
{
AllocBlock next = block->next;
*************** AllocSetDelete(MemoryContext context)
*** 567,575 ****
#ifdef CLOBBER_FREED_MEMORY
wipe_mem(block, block->freeptr - ((char *) block));
#endif
! free(block);
block = next;
}
}
/*
--- 568,583 ----
#ifdef CLOBBER_FREED_MEMORY
wipe_mem(block, block->freeptr - ((char *) block));
#endif
!
! /* Free the block, unless it's the keeper */
! if (block != set->keeper)
! free(block);
!
block = next;
}
+
+ /* Finally, free the context header + keeper block */
+ free(set);
}
/*
*************** AllocSetAlloc(MemoryContext context, Siz
*** 807,824 ****
block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
block->endptr = ((char *) block) + blksize;
- /*
- * If this is the first block of the set, make it the "keeper" block.
- * Formerly, a keeper block could only be created during context
- * creation, but allowing it to happen here lets us have fast reset
- * cycling even for contexts created with minContextSize = 0; that way
- * we don't have to force space to be allocated in contexts that might
- * never need any space. Don't mark an oversize block as a keeper,
- * however.
- */
- if (set->keeper == NULL && blksize == set->initBlockSize)
- set->keeper = block;
-
/* Mark unallocated space NOACCESS. */
VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
blksize - ALLOC_BLOCKHDRSZ);
--- 815,820 ----
*************** AllocSetStats(MemoryContext context, int
*** 1205,1215 ****
AllocSet set = (AllocSet) context;
Size nblocks = 0;
Size freechunks = 0;
! Size totalspace = 0;
Size freespace = 0;
AllocBlock block;
int fidx;
for (block = set->blocks; block != NULL; block = block->next)
{
nblocks++;
--- 1201,1214 ----
AllocSet set = (AllocSet) context;
Size nblocks = 0;
Size freechunks = 0;
! Size totalspace;
Size freespace = 0;
AllocBlock block;
int fidx;
+ /* Include context header in totalspace */
+ totalspace = set->headerSize;
+
for (block = set->blocks; block != NULL; block = block->next)
{
nblocks++;
*************** static void
*** 1264,1270 ****
AllocSetCheck(MemoryContext context)
{
AllocSet set = (AllocSet) context;
! char *name = set->header.name;
AllocBlock prevblock;
AllocBlock block;
--- 1263,1269 ----
AllocSetCheck(MemoryContext context)
{
AllocSet set = (AllocSet) context;
! const char *name = set->header.name;
AllocBlock prevblock;
AllocBlock block;
diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c
index 19390fa..99196f6 100644
*** a/src/backend/utils/mmgr/generation.c
--- b/src/backend/utils/mmgr/generation.c
*************** typedef struct GenerationContext
*** 61,66 ****
--- 61,67 ----
/* Generational context parameters */
Size blockSize; /* standard block size */
+ Size headerSize; /* allocated size of context header */
GenerationBlock *block; /* current (most recently allocated) block */
dlist_head blocks; /* list of blocks */
*************** struct GenerationChunk
*** 149,155 ****
static void *GenerationAlloc(MemoryContext context, Size size);
static void GenerationFree(MemoryContext context, void *pointer);
static void *GenerationRealloc(MemoryContext context, void *pointer, Size size);
- static void GenerationInit(MemoryContext context);
static void GenerationReset(MemoryContext context);
static void GenerationDelete(MemoryContext context);
static Size GenerationGetChunkSpace(MemoryContext context, void *pointer);
--- 150,155 ----
*************** static void GenerationCheck(MemoryContex
*** 164,174 ****
/*
* This is the virtual function table for Generation contexts.
*/
! static MemoryContextMethods GenerationMethods = {
GenerationAlloc,
GenerationFree,
GenerationRealloc,
- GenerationInit,
GenerationReset,
GenerationDelete,
GenerationGetChunkSpace,
--- 164,173 ----
/*
* This is the virtual function table for Generation contexts.
*/
! static const MemoryContextMethods GenerationMethods = {
GenerationAlloc,
GenerationFree,
GenerationRealloc,
GenerationReset,
GenerationDelete,
GenerationGetChunkSpace,
*************** static MemoryContextMethods GenerationMe
*** 208,215 ****
--- 207,216 ----
MemoryContext
GenerationContextCreate(MemoryContext parent,
const char *name,
+ int flags,
Size blockSize)
{
+ Size headerSize;
GenerationContext *set;
/* Assert we padded GenerationChunk properly */
*************** GenerationContextCreate(MemoryContext pa
*** 231,259 ****
elog(ERROR, "invalid blockSize for memory context: %zu",
blockSize);
! /* Do the type-independent part of context creation */
! set = (GenerationContext *) MemoryContextCreate(T_GenerationContext,
! sizeof(GenerationContext),
! &GenerationMethods,
! parent,
! name);
! set->blockSize = blockSize;
! return (MemoryContext) set;
! }
! /*
! * GenerationInit
! * Context-type-specific initialization routine.
! */
! static void
! GenerationInit(MemoryContext context)
! {
! GenerationContext *set = (GenerationContext *) context;
set->block = NULL;
dlist_init(&set->blocks);
}
/*
--- 232,282 ----
elog(ERROR, "invalid blockSize for memory context: %zu",
blockSize);
! /*
! * Allocate the context header. Unlike aset.c, we don't try to put this
! * into the first regular block, since that would prevent us from freeing
! * the first generation of allocations.
! */
! /* Size of the memory context header, including name storage if needed */
! if (flags & MEMCONTEXT_OPTION_COPY_NAME)
! headerSize = MAXALIGN(sizeof(GenerationContext) + strlen(name) + 1);
! else
! headerSize = MAXALIGN(sizeof(GenerationContext));
! set = (GenerationContext *) malloc(headerSize);
! if (set == NULL)
! {
! MemoryContextStats(TopMemoryContext);
! ereport(ERROR,
! (errcode(ERRCODE_OUT_OF_MEMORY),
! errmsg("out of memory"),
! errdetail("Failed while creating memory context \"%s\".",
! name)));
! }
! /*
! * Avoid writing code that can fail between here and MemoryContextCreate;
! * we'd leak the header if we ereport in this stretch.
! */
+ /* Fill in GenerationContext-specific header fields */
+ set->blockSize = blockSize;
+ set->headerSize = headerSize;
set->block = NULL;
dlist_init(&set->blocks);
+
+ /* Finally, do the type-independent part of context creation */
+ MemoryContextCreate((MemoryContext) set,
+ T_GenerationContext,
+ headerSize,
+ sizeof(GenerationContext),
+ &GenerationMethods,
+ parent,
+ name,
+ flags);
+
+ return (MemoryContext) set;
}
/*
*************** GenerationReset(MemoryContext context)
*** 296,311 ****
/*
* GenerationDelete
! * Frees all memory which is allocated in the given set, in preparation
! * for deletion of the set. We simply call GenerationReset() which does
! * all the dirty work.
*/
static void
GenerationDelete(MemoryContext context)
{
! /* just reset to release all the GenerationBlocks */
GenerationReset(context);
! /* we are not responsible for deleting the context node itself */
}
/*
--- 319,333 ----
/*
* GenerationDelete
! * Free all memory which is allocated in the given context.
*/
static void
GenerationDelete(MemoryContext context)
{
! /* Reset to release all the GenerationBlocks */
GenerationReset(context);
! /* And free the context header */
! free(context);
}
/*
*************** GenerationIsEmpty(MemoryContext context)
*** 659,665 ****
/*
* GenerationStats
! * Compute stats about memory consumption of an Generation.
*
* level: recursion level (0 at top level); used for print indentation.
* print: true to print stats to stderr.
--- 681,687 ----
/*
* GenerationStats
! * Compute stats about memory consumption of a Generation context.
*
* level: recursion level (0 at top level); used for print indentation.
* print: true to print stats to stderr.
*************** GenerationStats(MemoryContext context, i
*** 676,685 ****
Size nblocks = 0;
Size nchunks = 0;
Size nfreechunks = 0;
! Size totalspace = 0;
Size freespace = 0;
dlist_iter iter;
dlist_foreach(iter, &set->blocks)
{
GenerationBlock *block = dlist_container(GenerationBlock, node, iter.cur);
--- 698,710 ----
Size nblocks = 0;
Size nchunks = 0;
Size nfreechunks = 0;
! Size totalspace;
Size freespace = 0;
dlist_iter iter;
+ /* Include context header in totalspace */
+ totalspace = set->headerSize;
+
dlist_foreach(iter, &set->blocks)
{
GenerationBlock *block = dlist_container(GenerationBlock, node, iter.cur);
*************** static void
*** 727,733 ****
GenerationCheck(MemoryContext context)
{
GenerationContext *gen = (GenerationContext *) context;
! char *name = context->name;
dlist_iter iter;
/* walk all blocks in this context */
--- 752,758 ----
GenerationCheck(MemoryContext context)
{
GenerationContext *gen = (GenerationContext *) context;
! const char *name = context->name;
dlist_iter iter;
/* walk all blocks in this context */
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index c5c311f..2e4b692 100644
*** a/src/backend/utils/mmgr/mcxt.c
--- b/src/backend/utils/mmgr/mcxt.c
*************** MemoryContextInit(void)
*** 91,99 ****
AssertState(TopMemoryContext == NULL);
/*
! * First, initialize TopMemoryContext, which will hold the MemoryContext
! * nodes for all other contexts. (There is special-case code in
! * MemoryContextCreate() to handle this call.)
*/
TopMemoryContext = AllocSetContextCreate((MemoryContext) NULL,
"TopMemoryContext",
--- 91,97 ----
AssertState(TopMemoryContext == NULL);
/*
! * First, initialize TopMemoryContext, which is the parent of all others.
*/
TopMemoryContext = AllocSetContextCreate((MemoryContext) NULL,
"TopMemoryContext",
*************** MemoryContextInit(void)
*** 118,128 ****
* This should be the last step in this function, as elog.c assumes memory
* management works once ErrorContext is non-null.
*/
! ErrorContext = AllocSetContextCreate(TopMemoryContext,
! "ErrorContext",
! 8 * 1024,
! 8 * 1024,
! 8 * 1024);
MemoryContextAllowInCriticalSection(ErrorContext, true);
}
--- 116,127 ----
* This should be the last step in this function, as elog.c assumes memory
* management works once ErrorContext is non-null.
*/
! ErrorContext = AllocSetContextCreateExtended(TopMemoryContext,
! "ErrorContext",
! 0,
! 8 * 1024,
! 8 * 1024,
! 8 * 1024);
MemoryContextAllowInCriticalSection(ErrorContext, true);
}
*************** MemoryContextResetChildren(MemoryContext
*** 191,200 ****
* Delete a context and its descendants, and release all space
* allocated therein.
*
! * The type-specific delete routine removes all subsidiary storage
! * for the context, but we have to delete the context node itself,
! * as well as recurse to get the children. We must also delink the
! * node from its parent, if it has one.
*/
void
MemoryContextDelete(MemoryContext context)
--- 190,198 ----
* Delete a context and its descendants, and release all space
* allocated therein.
*
! * The type-specific delete routine removes all storage for the context,
! * but we have to recurse to handle the children.
! * We must also delink the context from its parent, if it has one.
*/
void
MemoryContextDelete(MemoryContext context)
*************** MemoryContextDelete(MemoryContext contex
*** 223,230 ****
MemoryContextSetParent(context, NULL);
context->methods->delete_context(context);
VALGRIND_DESTROY_MEMPOOL(context);
- pfree(context);
}
/*
--- 221,228 ----
MemoryContextSetParent(context, NULL);
context->methods->delete_context(context);
+
VALGRIND_DESTROY_MEMPOOL(context);
}
/*
*************** MemoryContextContains(MemoryContext cont
*** 587,686 ****
return ptr_context == context;
}
! /*--------------------
* MemoryContextCreate
* Context-type-independent part of context creation.
*
* This is only intended to be called by context-type-specific
* context creation routines, not by the unwashed masses.
*
! * The context creation procedure is a little bit tricky because
! * we want to be sure that we don't leave the context tree invalid
! * in case of failure (such as insufficient memory to allocate the
! * context node itself). The procedure goes like this:
! * 1. Context-type-specific routine first calls MemoryContextCreate(),
! * passing the appropriate tag/size/methods values (the methods
! * pointer will ordinarily point to statically allocated data).
! * The parent and name parameters usually come from the caller.
! * 2. MemoryContextCreate() attempts to allocate the context node,
! * plus space for the name. If this fails we can ereport() with no
! * damage done.
! * 3. We fill in all of the type-independent MemoryContext fields.
! * 4. We call the type-specific init routine (using the methods pointer).
! * The init routine is required to make the node minimally valid
! * with zero chance of failure --- it can't allocate more memory,
! * for example.
! * 5. Now we have a minimally valid node that can behave correctly
! * when told to reset or delete itself. We link the node to its
! * parent (if any), making the node part of the context tree.
! * 6. We return to the context-type-specific routine, which finishes
* up type-specific initialization. This routine can now do things
* that might fail (like allocate more memory), so long as it's
* sure the node is left in a state that delete will handle.
*
! * This protocol doesn't prevent us from leaking memory if step 6 fails
! * during creation of a top-level context, since there's no parent link
! * in that case. However, if you run out of memory while you're building
! * a top-level context, you might as well go home anyway...
! *
! * Normally, the context node and the name are allocated from
! * TopMemoryContext (NOT from the parent context, since the node must
! * survive resets of its parent context!). However, this routine is itself
! * used to create TopMemoryContext! If we see that TopMemoryContext is NULL,
! * we assume we are creating TopMemoryContext and use malloc() to allocate
! * the node.
*
! * Note that the name field of a MemoryContext does not point to
! * separately-allocated storage, so it should not be freed at context
! * deletion.
! *--------------------
*/
! MemoryContext
! MemoryContextCreate(NodeTag tag, Size size,
! MemoryContextMethods *methods,
MemoryContext parent,
! const char *name)
{
! MemoryContext node;
! Size needed = size + strlen(name) + 1;
!
! /* creating new memory contexts is not allowed in a critical section */
Assert(CritSectionCount == 0);
! /* Get space for node and name */
! if (TopMemoryContext != NULL)
! {
! /* Normal case: allocate the node in TopMemoryContext */
! node = (MemoryContext) MemoryContextAlloc(TopMemoryContext,
! needed);
! }
! else
! {
! /* Special case for startup: use good ol' malloc */
! node = (MemoryContext) malloc(needed);
! Assert(node != NULL);
! }
! /* Initialize the node as best we can */
! MemSet(node, 0, size);
node->type = tag;
node->methods = methods;
! node->parent = NULL; /* for the moment */
node->firstchild = NULL;
node->prevchild = NULL;
! node->nextchild = NULL;
! node->isReset = true;
! node->name = ((char *) node) + size;
! strcpy(node->name, name);
! /* Type-specific routine finishes any other essential initialization */
! node->methods->init(node);
! /* OK to link node to parent (if any) */
! /* Could use MemoryContextSetParent here, but doesn't seem worthwhile */
if (parent)
{
- node->parent = parent;
node->nextchild = parent->firstchild;
if (parent->firstchild != NULL)
parent->firstchild->prevchild = node;
--- 585,669 ----
return ptr_context == context;
}
! /*
* MemoryContextCreate
* Context-type-independent part of context creation.
*
* This is only intended to be called by context-type-specific
* context creation routines, not by the unwashed masses.
*
! * The memory context creation procedure goes like this:
! * 1. Context-type-specific routine makes some initial space allocation,
! * including enough space for the context header. If it fails,
! * it can ereport() with no damage done.
! * 2. Context-type-specific routine sets up all type-specific fields of
! * the header (those beyond MemoryContextData proper), as well as any
! * other management fields it needs to have a fully valid context.
! * Usually, failure in this step is impossible, but if it's possible
! * the initial space allocation should be freed before ereport'ing.
! * 3. Context-type-specific routine calls MemoryContextCreate() to fill in
! * the generic header fields and link the context into the context tree.
! * 4. We return to the context-type-specific routine, which finishes
* up type-specific initialization. This routine can now do things
* that might fail (like allocate more memory), so long as it's
* sure the node is left in a state that delete will handle.
*
! * node: the as-yet-uninitialized common part of the context header node.
! * tag: NodeTag code identifying the memory context type.
! * size: total size of context header, including context-type-specific fields
! * as well as space for the context name.
! * nameoffset: where within the "size" space to insert the context name.
! * methods: context-type-specific methods (usually statically allocated).
! * parent: parent context, or NULL if this will be a top-level context.
! * name: name of context (for debugging only, need not be unique).
! * flags: bitmask of MEMCONTEXT_OPTION_XXX flags.
*
! * Context routines generally assume that MemoryContextCreate can't fail,
! * so this can contain Assert but not elog/ereport.
*/
! void
! MemoryContextCreate(MemoryContext node,
! NodeTag tag, Size size, Size nameoffset,
! const MemoryContextMethods *methods,
MemoryContext parent,
! const char *name,
! int flags)
{
! /* Creating new memory contexts is not allowed in a critical section */
Assert(CritSectionCount == 0);
! /* Check size is sane */
! Assert(nameoffset >= sizeof(MemoryContextData));
! Assert((flags & MEMCONTEXT_OPTION_COPY_NAME) ?
! size >= nameoffset + strlen(name) + 1 :
! size >= nameoffset);
! /* Initialize all standard fields of memory context header */
node->type = tag;
+ node->isReset = true;
node->methods = methods;
! node->parent = parent;
node->firstchild = NULL;
node->prevchild = NULL;
! node->reset_cbs = NULL;
! if (flags & MEMCONTEXT_OPTION_COPY_NAME)
! {
! /* Insert context name into space reserved for it */
! char *namecopy = ((char *) node) + nameoffset;
! node->name = namecopy;
! strcpy(namecopy, name);
! }
! else
! {
! /* Assume the passed-in name is statically allocated */
! node->name = name;
! }
!
! /* OK to link node into context tree */
if (parent)
{
node->nextchild = parent->firstchild;
if (parent->firstchild != NULL)
parent->firstchild->prevchild = node;
*************** MemoryContextCreate(NodeTag tag, Size si
*** 688,698 ****
/* inherit allowInCritSection flag from parent */
node->allowInCritSection = parent->allowInCritSection;
}
VALGRIND_CREATE_MEMPOOL(node, 0, false);
-
- /* Return to type-specific creation routine to finish up */
- return node;
}
/*
--- 671,683 ----
/* inherit allowInCritSection flag from parent */
node->allowInCritSection = parent->allowInCritSection;
}
+ else
+ {
+ node->nextchild = NULL;
+ node->allowInCritSection = false;
+ }
VALGRIND_CREATE_MEMPOOL(node, 0, false);
}
/*
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index ee21752..91e154a 100644
*** a/src/backend/utils/mmgr/slab.c
--- b/src/backend/utils/mmgr/slab.c
*************** typedef struct SlabContext
*** 67,72 ****
--- 67,73 ----
Size chunkSize; /* chunk size */
Size fullChunkSize; /* chunk size including header and alignment */
Size blockSize; /* block size */
+ Size headerSize; /* allocated size of context header */
int chunksPerBlock; /* number of chunks per block */
int minFreeChunks; /* min number of free chunks in any block */
int nblocks; /* number of blocks allocated */
*************** typedef struct SlabChunk
*** 126,132 ****
static void *SlabAlloc(MemoryContext context, Size size);
static void SlabFree(MemoryContext context, void *pointer);
static void *SlabRealloc(MemoryContext context, void *pointer, Size size);
- static void SlabInit(MemoryContext context);
static void SlabReset(MemoryContext context);
static void SlabDelete(MemoryContext context);
static Size SlabGetChunkSpace(MemoryContext context, void *pointer);
--- 127,132 ----
*************** static void SlabCheck(MemoryContext cont
*** 140,150 ****
/*
* This is the virtual function table for Slab contexts.
*/
! static MemoryContextMethods SlabMethods = {
SlabAlloc,
SlabFree,
SlabRealloc,
- SlabInit,
SlabReset,
SlabDelete,
SlabGetChunkSpace,
--- 140,149 ----
/*
* This is the virtual function table for Slab contexts.
*/
! static const MemoryContextMethods SlabMethods = {
SlabAlloc,
SlabFree,
SlabRealloc,
SlabReset,
SlabDelete,
SlabGetChunkSpace,
*************** static MemoryContextMethods SlabMethods
*** 177,200 ****
* Create a new Slab context.
*
* parent: parent context, or NULL if top-level context
! * name: name of context (for debugging --- string will be copied)
* blockSize: allocation block size
* chunkSize: allocation chunk size
*
* The chunkSize may not exceed:
* MAXALIGN_DOWN(SIZE_MAX) - MAXALIGN(sizeof(SlabBlock)) - SLAB_CHUNKHDRSZ
- *
*/
MemoryContext
SlabContextCreate(MemoryContext parent,
const char *name,
Size blockSize,
Size chunkSize)
{
int chunksPerBlock;
Size fullChunkSize;
Size freelistSize;
SlabContext *slab;
/* Assert we padded SlabChunk properly */
StaticAssertStmt(sizeof(SlabChunk) == MAXALIGN(sizeof(SlabChunk)),
--- 176,206 ----
* Create a new Slab context.
*
* parent: parent context, or NULL if top-level context
! * name: name of context (for debugging only, need not be unique)
! * flags: bitmask of MEMCONTEXT_OPTION_XXX flags
* blockSize: allocation block size
* chunkSize: allocation chunk size
*
+ * Notes: if flags & MEMCONTEXT_OPTION_COPY_NAME, the name string will be
+ * copied into context-lifespan storage; otherwise, it had better be
+ * statically allocated.
* The chunkSize may not exceed:
* MAXALIGN_DOWN(SIZE_MAX) - MAXALIGN(sizeof(SlabBlock)) - SLAB_CHUNKHDRSZ
*/
MemoryContext
SlabContextCreate(MemoryContext parent,
const char *name,
+ int flags,
Size blockSize,
Size chunkSize)
{
int chunksPerBlock;
Size fullChunkSize;
Size freelistSize;
+ Size nameOffset;
+ Size headerSize;
SlabContext *slab;
+ int i;
/* Assert we padded SlabChunk properly */
StaticAssertStmt(sizeof(SlabChunk) == MAXALIGN(sizeof(SlabChunk)),
*************** SlabContextCreate(MemoryContext parent,
*** 227,265 ****
/* make sure the chunks actually fit on the block */
Assert((fullChunkSize * chunksPerBlock) + sizeof(SlabBlock) <= blockSize);
! /* Do the type-independent part of context creation */
! slab = (SlabContext *)
! MemoryContextCreate(T_SlabContext,
! (offsetof(SlabContext, freelist) + freelistSize),
! &SlabMethods,
! parent,
! name);
! slab->blockSize = blockSize;
slab->chunkSize = chunkSize;
slab->fullChunkSize = fullChunkSize;
slab->chunksPerBlock = chunksPerBlock;
- slab->nblocks = 0;
slab->minFreeChunks = 0;
!
! return (MemoryContext) slab;
! }
!
! /*
! * SlabInit
! * Context-type-specific initialization routine.
! */
! static void
! SlabInit(MemoryContext context)
! {
! int i;
! SlabContext *slab = castNode(SlabContext, context);
!
! Assert(slab);
/* initialize the freelist slots */
for (i = 0; i < (slab->chunksPerBlock + 1); i++)
dlist_init(&slab->freelist[i]);
}
/*
--- 233,290 ----
/* make sure the chunks actually fit on the block */
Assert((fullChunkSize * chunksPerBlock) + sizeof(SlabBlock) <= blockSize);
! /*
! * Allocate the context header. Unlike aset.c, we don't try to put this
! * into the first regular block; not worth the extra complication.
! */
! /* Size of the memory context header, including name storage if needed */
! nameOffset = offsetof(SlabContext, freelist) + freelistSize;
! if (flags & MEMCONTEXT_OPTION_COPY_NAME)
! headerSize = nameOffset + strlen(name) + 1;
! else
! headerSize = nameOffset;
!
! slab = (SlabContext *) malloc(headerSize);
! if (slab == NULL)
! {
! MemoryContextStats(TopMemoryContext);
! ereport(ERROR,
! (errcode(ERRCODE_OUT_OF_MEMORY),
! errmsg("out of memory"),
! errdetail("Failed while creating memory context \"%s\".",
! name)));
! }
!
! /*
! * Avoid writing code that can fail between here and MemoryContextCreate;
! * we'd leak the header if we ereport in this stretch.
! */
!
! /* Fill in SlabContext-specific header fields */
slab->chunkSize = chunkSize;
slab->fullChunkSize = fullChunkSize;
+ slab->blockSize = blockSize;
+ slab->headerSize = headerSize;
slab->chunksPerBlock = chunksPerBlock;
slab->minFreeChunks = 0;
! slab->nblocks = 0;
/* initialize the freelist slots */
for (i = 0; i < (slab->chunksPerBlock + 1); i++)
dlist_init(&slab->freelist[i]);
+
+ /* Finally, do the type-independent part of context creation */
+ MemoryContextCreate((MemoryContext) slab,
+ T_SlabContext,
+ headerSize,
+ nameOffset,
+ &SlabMethods,
+ parent,
+ name,
+ flags);
+
+ return (MemoryContext) slab;
}
/*
*************** SlabReset(MemoryContext context)
*** 308,321 ****
/*
* SlabDelete
! * Frees all memory which is allocated in the given slab, in preparation
! * for deletion of the slab. We simply call SlabReset().
*/
static void
SlabDelete(MemoryContext context)
{
! /* just reset the context */
SlabReset(context);
}
/*
--- 333,347 ----
/*
* SlabDelete
! * Free all memory which is allocated in the given context.
*/
static void
SlabDelete(MemoryContext context)
{
! /* Reset to release all the SlabBlocks */
SlabReset(context);
+ /* And free the context header */
+ free(context);
}
/*
*************** SlabIsEmpty(MemoryContext context)
*** 613,619 ****
/*
* SlabStats
! * Compute stats about memory consumption of an Slab.
*
* level: recursion level (0 at top level); used for print indentation.
* print: true to print stats to stderr.
--- 639,645 ----
/*
* SlabStats
! * Compute stats about memory consumption of a Slab context.
*
* level: recursion level (0 at top level); used for print indentation.
* print: true to print stats to stderr.
*************** SlabStats(MemoryContext context, int lev
*** 626,636 ****
SlabContext *slab = castNode(SlabContext, context);
Size nblocks = 0;
Size freechunks = 0;
! Size totalspace = 0;
Size freespace = 0;
int i;
! Assert(slab);
for (i = 0; i <= slab->chunksPerBlock; i++)
{
--- 652,663 ----
SlabContext *slab = castNode(SlabContext, context);
Size nblocks = 0;
Size freechunks = 0;
! Size totalspace;
Size freespace = 0;
int i;
! /* Include context header in totalspace */
! totalspace = slab->headerSize;
for (i = 0; i <= slab->chunksPerBlock; i++)
{
*************** SlabCheck(MemoryContext context)
*** 682,688 ****
{
int i;
SlabContext *slab = castNode(SlabContext, context);
! char *name = slab->header.name;
char *freechunks;
Assert(slab);
--- 709,715 ----
{
int i;
SlabContext *slab = castNode(SlabContext, context);
! const char *name = slab->header.name;
char *freechunks;
Assert(slab);
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index e22d9fb..c7eb1e7 100644
*** a/src/include/nodes/memnodes.h
--- b/src/include/nodes/memnodes.h
*************** typedef struct MemoryContextMethods
*** 57,63 ****
/* call this free_p in case someone #define's free() */
void (*free_p) (MemoryContext context, void *pointer);
void *(*realloc) (MemoryContext context, void *pointer, Size size);
- void (*init) (MemoryContext context);
void (*reset) (MemoryContext context);
void (*delete_context) (MemoryContext context);
Size (*get_chunk_space) (MemoryContext context, void *pointer);
--- 57,62 ----
*************** typedef struct MemoryContextData
*** 76,87 ****
/* these two fields are placed here to minimize alignment wastage: */
bool isReset; /* T = no space alloced since last reset */
bool allowInCritSection; /* allow palloc in critical section */
! MemoryContextMethods *methods; /* virtual function table */
MemoryContext parent; /* NULL if no parent (toplevel context) */
MemoryContext firstchild; /* head of linked list of children */
MemoryContext prevchild; /* previous child of same parent */
MemoryContext nextchild; /* next child of same parent */
! char *name; /* context name (just for debugging) */
MemoryContextCallback *reset_cbs; /* list of reset/delete callbacks */
} MemoryContextData;
--- 75,86 ----
/* these two fields are placed here to minimize alignment wastage: */
bool isReset; /* T = no space alloced since last reset */
bool allowInCritSection; /* allow palloc in critical section */
! const MemoryContextMethods *methods; /* virtual function table */
MemoryContext parent; /* NULL if no parent (toplevel context) */
MemoryContext firstchild; /* head of linked list of children */
MemoryContext prevchild; /* previous child of same parent */
MemoryContext nextchild; /* next child of same parent */
! const char *name; /* context name (just for debugging) */
MemoryContextCallback *reset_cbs; /* list of reset/delete callbacks */
} MemoryContextData;
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index d177b0c..85901dd 100644
*** a/src/include/utils/memutils.h
--- b/src/include/utils/memutils.h
*************** GetMemoryChunkContext(void *pointer)
*** 132,141 ****
* context creation. It's intended to be called from context-type-
* specific creation routines, and noplace else.
*/
! extern MemoryContext MemoryContextCreate(NodeTag tag, Size size,
! MemoryContextMethods *methods,
MemoryContext parent,
! const char *name);
/*
--- 132,143 ----
* context creation. It's intended to be called from context-type-
* specific creation routines, and noplace else.
*/
! extern void MemoryContextCreate(MemoryContext node,
! NodeTag tag, Size size, Size nameoffset,
! const MemoryContextMethods *methods,
MemoryContext parent,
! const char *name,
! int flags);
/*
*************** extern MemoryContext MemoryContextCreate
*** 143,166 ****
*/
/* aset.c */
! extern MemoryContext AllocSetContextCreate(MemoryContext parent,
! const char *name,
! Size minContextSize,
! Size initBlockSize,
! Size maxBlockSize);
/* slab.c */
extern MemoryContext SlabContextCreate(MemoryContext parent,
const char *name,
Size blockSize,
Size chunkSize);
/* generation.c */
extern MemoryContext GenerationContextCreate(MemoryContext parent,
const char *name,
Size blockSize);
/*
* Recommended default alloc parameters, suitable for "ordinary" contexts
* that might hold quite a lot of data.
*/
--- 145,188 ----
*/
/* aset.c */
! extern MemoryContext AllocSetContextCreateExtended(MemoryContext parent,
! const char *name,
! int flags,
! Size minContextSize,
! Size initBlockSize,
! Size maxBlockSize);
!
! /* backwards compatibility macro: only works for constant context names */
! #ifdef HAVE__BUILTIN_CONSTANT_P
! #define AllocSetContextCreate(parent, name, allocparams) \
! (StaticAssertExpr(__builtin_constant_p(name), \
! "Use AllocSetContextCreateExtended with MEMCONTEXT_OPTION_COPY_NAME for non-constant context
names"),\
! AllocSetContextCreateExtended(parent, name, 0, allocparams))
! #else
! #define AllocSetContextCreate(parent, name, allocparams) \
! AllocSetContextCreateExtended(parent, name, 0, allocparams)
! #endif
/* slab.c */
extern MemoryContext SlabContextCreate(MemoryContext parent,
const char *name,
+ int flags,
Size blockSize,
Size chunkSize);
/* generation.c */
extern MemoryContext GenerationContextCreate(MemoryContext parent,
const char *name,
+ int flags,
Size blockSize);
/*
+ * Flag option bits for FooContextCreate functions.
+ * In future, some of these might be relevant to only some context types.
+ */
+ #define MEMCONTEXT_OPTION_COPY_NAME 0x0001 /* is passed name transient? */
+
+ /*
* Recommended default alloc parameters, suitable for "ordinary" contexts
* that might hold quite a lot of data.
*/
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 9f53132..d2723e0 100644
*** a/src/pl/plperl/plperl.c
--- b/src/pl/plperl/plperl.c
*************** compile_plperl_function(Oid fn_oid, bool
*** 2777,2785 ****
/************************************************************
* Allocate a context that will hold all PG data for the procedure.
************************************************************/
! proc_cxt = AllocSetContextCreate(TopMemoryContext,
! NameStr(procStruct->proname),
! ALLOCSET_SMALL_SIZES);
/************************************************************
* Allocate and fill a new procedure description block.
--- 2777,2786 ----
/************************************************************
* Allocate a context that will hold all PG data for the procedure.
************************************************************/
! proc_cxt = AllocSetContextCreateExtended(TopMemoryContext,
! NameStr(procStruct->proname),
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
/************************************************************
* Allocate and fill a new procedure description block.
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index b7c24e3..4d229da 100644
*** a/src/pl/plpython/plpy_procedure.c
--- b/src/pl/plpython/plpy_procedure.c
*************** PLy_procedure_create(HeapTuple procTup,
*** 166,174 ****
}
/* Create long-lived context that all procedure info will live in */
! cxt = AllocSetContextCreate(TopMemoryContext,
! procName,
! ALLOCSET_DEFAULT_SIZES);
oldcxt = MemoryContextSwitchTo(cxt);
--- 166,175 ----
}
/* Create long-lived context that all procedure info will live in */
! cxt = AllocSetContextCreateExtended(TopMemoryContext,
! procName,
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_DEFAULT_SIZES);
oldcxt = MemoryContextSwitchTo(cxt);
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index e0792d9..fd118e5 100644
*** a/src/pl/tcl/pltcl.c
--- b/src/pl/tcl/pltcl.c
*************** compile_pltcl_function(Oid fn_oid, Oid t
*** 1471,1479 ****
* Allocate a context that will hold all PG data for the procedure.
* We use the internal proc name as the context name.
************************************************************/
! proc_cxt = AllocSetContextCreate(TopMemoryContext,
! internal_proname,
! ALLOCSET_SMALL_SIZES);
/************************************************************
* Allocate and fill a new procedure description block.
--- 1471,1480 ----
* Allocate a context that will hold all PG data for the procedure.
* We use the internal proc name as the context name.
************************************************************/
! proc_cxt = AllocSetContextCreateExtended(TopMemoryContext,
! internal_proname,
! MEMCONTEXT_OPTION_COPY_NAME,
! ALLOCSET_SMALL_SIZES);
/************************************************************
* Allocate and fill a new procedure description block.
pgsql-hackers by date: