@ -438,14 +438,14 @@ AllocSetContextCreate(MemoryContext parent,
Size initBlockSize ,
Size maxBlockSize )
{
AllocSet contex t;
AllocSet se t;
/* Do the type-independent part of context creation */
contex t = ( AllocSet ) MemoryContextCreate ( T_AllocSetContext ,
sizeof ( AllocSetContext ) ,
& AllocSetMethods ,
parent ,
name ) ;
se t = ( AllocSet ) MemoryContextCreate ( T_AllocSetContext ,
sizeof ( AllocSetContext ) ,
& AllocSetMethods ,
parent ,
name ) ;
/*
* Make sure alloc parameters are reasonable , and save them .
@ -459,9 +459,9 @@ AllocSetContextCreate(MemoryContext parent,
if ( maxBlockSize < initBlockSize )
maxBlockSize = initBlockSize ;
Assert ( AllocHugeSizeIsValid ( maxBlockSize ) ) ; /* must be safe to double */
contex t- > initBlockSize = initBlockSize ;
contex t- > maxBlockSize = maxBlockSize ;
contex t- > nextBlockSize = initBlockSize ;
se t- > initBlockSize = initBlockSize ;
se t- > maxBlockSize = maxBlockSize ;
se t- > nextBlockSize = initBlockSize ;
/*
* Compute the allocation chunk size limit for this context . It can ' t be
@ -477,10 +477,10 @@ AllocSetContextCreate(MemoryContext parent,
* and actually - allocated sizes of any chunk must be on the same side of
* the limit , else we get confused about whether the chunk is " big " .
*/
contex t- > allocChunkLimit = ALLOC_CHUNK_LIMIT ;
while ( ( Size ) ( contex t- > allocChunkLimit + ALLOC_CHUNKHDRSZ ) >
se t- > allocChunkLimit = ALLOC_CHUNK_LIMIT ;
while ( ( Size ) ( se t- > allocChunkLimit + ALLOC_CHUNKHDRSZ ) >
( Size ) ( ( maxBlockSize - ALLOC_BLOCKHDRSZ ) / ALLOC_CHUNK_FRACTION ) )
contex t- > allocChunkLimit > > = 1 ;
se t- > allocChunkLimit > > = 1 ;
/*
* Grab always - allocated space , if requested
@ -500,20 +500,20 @@ AllocSetContextCreate(MemoryContext parent,
errdetail ( " Failed while creating memory context \" %s \" . " ,
name ) ) ) ;
}
block - > aset = contex t;
block - > aset = se t;
block - > freeptr = ( ( char * ) block ) + ALLOC_BLOCKHDRSZ ;
block - > endptr = ( ( char * ) block ) + blksize ;
block - > next = contex t- > blocks ;
contex t- > blocks = block ;
block - > next = se t- > blocks ;
se t- > blocks = block ;
/* Mark block as not to be released at reset time */
contex t- > keeper = block ;
se t- > keeper = block ;
/* Mark unallocated space NOACCESS; leave the block header alone. */
VALGRIND_MAKE_MEM_NOACCESS ( block - > freeptr ,
blksize - ALLOC_BLOCKHDRSZ ) ;
}
return ( MemoryContext ) contex t;
return ( MemoryContext ) se t;
}
/*