mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using a C++ keyword as a structure member name.

Browse Source 
Per request from Peter Eisentraut.
This commit is contained in:
Robert Haas 2015-05-05 22:41:03 -04:00
parent 929ca96584
commit 1998261034
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/access/transam/parallel.c
View File

@ -266,8 +266,9 @@ InitializeParallelDSM(ParallelContext *pcxt)
else else
{ {
pcxt->nworkers = 0; pcxt->nworkers = 0;
pcxt->private = MemoryContextAlloc(TopMemoryContext, segsize); pcxt->private_memory = MemoryContextAlloc(TopMemoryContext, segsize);
pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private, segsize); pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private_memory,
segsize);
} }
/* Initialize fixed-size state in shared memory. */ /* Initialize fixed-size state in shared memory. */
@ -538,10 +539,10 @@ DestroyParallelContext(ParallelContext *pcxt)
* If this parallel context is actually in backend-private memory rather * If this parallel context is actually in backend-private memory rather
* than shared memory, free that memory instead. * than shared memory, free that memory instead.
*/ */
if (pcxt->private != NULL) if (pcxt->private_memory != NULL)
{ {
pfree(pcxt->private); pfree(pcxt->private_memory);
pcxt->private = NULL; pcxt->private_memory = NULL;
} }
/* Wait until the workers actually die. */ /* Wait until the workers actually die. */

2
src/include/access/parallel.h
View File

@ -41,7 +41,7 @@ typedef struct ParallelContext
ErrorContextCallback *error_context_stack; ErrorContextCallback *error_context_stack;
shm_toc_estimator estimator; shm_toc_estimator estimator;
dsm_segment *seg; dsm_segment *seg;
void *private; void *private_memory;
shm_toc *toc; shm_toc *toc;
ParallelWorkerInfo *worker; ParallelWorkerInfo *worker;
} ParallelContext; } ParallelContext;