Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit30e98a7

Browse files
committed
Pull up isReset flag from AllocSetContext to MemoryContext struct. This
avoids the overhead of one function call when calling MemoryContextReset(),and it seems like the isReset optimization would be applicable to any newmemory context we might invent in the future anyway.This buys back the overhead I just added in previous patch to always callMemoryContextReset() in ExecScan, even when there's no quals or projections.
1 parent0319da6 commit30e98a7

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

‎src/backend/utils/mmgr/aset.c

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ typedef void *AllocPointer;
128128
/*
129129
* AllocSetContext is our standard implementation of MemoryContext.
130130
*
131-
* Note: isReset means there is nothing for AllocSetReset to do. This is
131+
* Note:header.isReset means there is nothing for AllocSetReset to do. This is
132132
* different from the aset being physically empty (empty blocks list) because
133133
* we may still have a keeper block. It's also different from the set being
134134
* logically empty, because we don't attempt to detect pfree'ing the last
@@ -140,7 +140,6 @@ typedef struct AllocSetContext
140140
/* Info about storage allocated in this context: */
141141
AllocBlockblocks;/* head of list of blocks in this set */
142142
AllocChunkfreelist[ALLOCSET_NUM_FREELISTS];/* free chunk lists */
143-
boolisReset;/* T = no space alloced since last reset */
144143
/* Allocation parameters for this context: */
145144
SizeinitBlockSize;/* initial block size */
146145
SizemaxBlockSize;/* maximum block size */
@@ -427,8 +426,6 @@ AllocSetContextCreate(MemoryContext parent,
427426
context->keeper=block;
428427
}
429428

430-
context->isReset= true;
431-
432429
return (MemoryContext)context;
433430
}
434431

@@ -472,10 +469,6 @@ AllocSetReset(MemoryContext context)
472469

473470
AssertArg(AllocSetIsValid(set));
474471

475-
/* Nothing to do if no pallocs since startup or last reset */
476-
if (set->isReset)
477-
return;
478-
479472
#ifdefMEMORY_CONTEXT_CHECKING
480473
/* Check for corruption and leaks before freeing */
481474
AllocSetCheck(context);
@@ -519,8 +512,6 @@ AllocSetReset(MemoryContext context)
519512

520513
/* Reset block size allocation sequence, too */
521514
set->nextBlockSize=set->initBlockSize;
522-
523-
set->isReset= true;
524515
}
525516

526517
/*
@@ -629,8 +620,6 @@ AllocSetAlloc(MemoryContext context, Size size)
629620
set->blocks=block;
630621
}
631622

632-
set->isReset= false;
633-
634623
AllocAllocInfo(set,chunk);
635624
returnAllocChunkGetPointer(chunk);
636625
}
@@ -662,9 +651,6 @@ AllocSetAlloc(MemoryContext context, Size size)
662651
randomize_mem((char*)AllocChunkGetPointer(chunk),size);
663652
#endif
664653

665-
/* isReset must be false already */
666-
Assert(!set->isReset);
667-
668654
AllocAllocInfo(set,chunk);
669655
returnAllocChunkGetPointer(chunk);
670656
}
@@ -822,8 +808,6 @@ AllocSetAlloc(MemoryContext context, Size size)
822808
randomize_mem((char*)AllocChunkGetPointer(chunk),size);
823809
#endif
824810

825-
set->isReset= false;
826-
827811
AllocAllocInfo(set,chunk);
828812
returnAllocChunkGetPointer(chunk);
829813
}
@@ -922,9 +906,6 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
922906
set->header.name,chunk);
923907
#endif
924908

925-
/* isReset must be false already */
926-
Assert(!set->isReset);
927-
928909
/*
929910
* Chunk sizes are aligned to power of 2 in AllocSetAlloc(). Maybe the
930911
* allocated area already is >= the new size. (In particular, we always
@@ -1059,15 +1040,13 @@ AllocSetGetChunkSpace(MemoryContext context, void *pointer)
10591040
staticbool
10601041
AllocSetIsEmpty(MemoryContextcontext)
10611042
{
1062-
AllocSetset= (AllocSet)context;
1063-
10641043
/*
10651044
* For now, we say "empty" only if the context is new or just reset. We
10661045
* could examine the freelists to determine if all space has been freed,
10671046
* but it's not really worth the trouble for present uses of this
10681047
* functionality.
10691048
*/
1070-
if (set->isReset)
1049+
if (context->isReset)
10711050
return true;
10721051
return false;
10731052
}

‎src/backend/utils/mmgr/mcxt.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,12 @@ MemoryContextReset(MemoryContext context)
127127
if (context->firstchild!=NULL)
128128
MemoryContextResetChildren(context);
129129

130-
(*context->methods->reset) (context);
130+
/* Nothing to do if no pallocs since startup or last reset */
131+
if (!context->isReset)
132+
{
133+
(*context->methods->reset) (context);
134+
context->isReset= true;
135+
}
131136
}
132137

133138
/*
@@ -476,6 +481,7 @@ MemoryContextCreate(NodeTag tag, Size size,
476481
node->parent=NULL;/* for the moment */
477482
node->firstchild=NULL;
478483
node->nextchild=NULL;
484+
node->isReset= true;
479485
node->name= ((char*)node)+size;
480486
strcpy(node->name,name);
481487

@@ -504,13 +510,16 @@ MemoryContextCreate(NodeTag tag, Size size,
504510
void*
505511
MemoryContextAlloc(MemoryContextcontext,Sizesize)
506512
{
513+
void*ret;
507514
AssertArg(MemoryContextIsValid(context));
508515

509516
if (!AllocSizeIsValid(size))
510517
elog(ERROR,"invalid memory alloc request size %lu",
511518
(unsigned long)size);
512519

513-
return (*context->methods->alloc) (context,size);
520+
ret= (*context->methods->alloc) (context,size);
521+
context->isReset= false;
522+
returnret;
514523
}
515524

516525
/*
@@ -535,6 +544,7 @@ MemoryContextAllocZero(MemoryContext context, Size size)
535544

536545
MemSetAligned(ret,0,size);
537546

547+
context->isReset= false;
538548
returnret;
539549
}
540550

@@ -560,6 +570,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size)
560570

561571
MemSetLoop(ret,0,size);
562572

573+
context->isReset= false;
563574
returnret;
564575
}
565576

@@ -620,6 +631,9 @@ repalloc(void *pointer, Size size)
620631
elog(ERROR,"invalid memory alloc request size %lu",
621632
(unsigned long)size);
622633

634+
/* isReset must be false already */
635+
Assert(!header->context->isReset);
636+
623637
return (*header->context->methods->realloc) (header->context,
624638
pointer,size);
625639
}

‎src/include/nodes/memnodes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ typedef struct MemoryContextData
5959
MemoryContextfirstchild;/* head of linked list of children */
6060
MemoryContextnextchild;/* next child of same parent */
6161
char*name;/* context name (just for debugging) */
62+
boolisReset;/* T = no space alloced since last reset */
6263
}MemoryContextData;
6364

6465
/* utils/palloc.h contains typedef struct MemoryContextData *MemoryContext */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp