Skip to content

Commit 478846e

Browse files
hlinnakahlinnaka
committed
Rename some shared memory initialization routines
To make them follow the usual naming convention where FoobarShmemSize() calculates the amount of shared memory needed by Foobar subsystem, and FoobarShmemInit() performs the initialization. I didn't rename CreateLWLocks() and InitShmmeIndex(), because they are a little special. They need to be called before any of the other ShmemInit() functions, because they set up the shared memory bookkeeping itself. I also didn't rename InitProcGlobal(), because unlike other Shmeminit functions, it's not called by individual backends. Reviewed-by: Andreas Karlsson Discussion: https://www.postgresql.org/message-id/c09694ff-2453-47e5-b26c-32a16cd75ce6@iki.fi
1 parent fbce7df commit 478846e

File tree

14 files changed

+33
-33
lines changed

14 files changed

+33
-33
lines changed

‎src/backend/storage/buffer/buf_init.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ CkptSortItem *CkptBufferIds;
6565
* postmaster, or in a standalone backend).
6666
*/
6767
void
68-
InitBufferPool(void)
68+
BufferManagerShmemInit(void)
6969
{
7070
bool foundBufs,
7171
foundDescs,
@@ -151,13 +151,13 @@ InitBufferPool(void)
151151
}
152152

153153
/*
154-
* BufferShmemSize
154+
* BufferManagerShmemSize
155155
*
156156
* compute the size of shared memory for the buffer pool including
157157
* data pages, buffer descriptors, hash tables, etc.
158158
*/
159159
Size
160-
BufferShmemSize(void)
160+
BufferManagerShmemSize(void)
161161
{
162162
Size size = 0;
163163

‎src/backend/storage/buffer/bufmgr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3582,7 +3582,7 @@ AtEOXact_Buffers(bool isCommit)
35823582
* buffer pool.
35833583
*/
35843584
void
3585-
InitBufferPoolAccess(void)
3585+
InitBufferManagerAccess(void)
35863586
{
35873587
HASHCTL hash_ctl;
35883588

‎src/backend/storage/buffer/freelist.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ StrategyInitialize(bool init)
506506

507507
/*
508508
* Grab the whole linked list of free buffers for our strategy. We
509-
* assume it was previously set up by InitBufferPool().
509+
* assume it was previously set up by BufferManagerShmemInit().
510510
*/
511511
StrategyControl->firstFreeBuffer = 0;
512512
StrategyControl->lastFreeBuffer = NBuffers - 1;

‎src/backend/storage/ipc/ipci.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ CalculateShmemSize(int *num_semaphores)
115115
sizeof(ShmemIndexEnt)));
116116
size = add_size(size, dsm_estimate_size());
117117
size = add_size(size, DSMRegistryShmemSize());
118-
size = add_size(size, BufferShmemSize());
118+
size = add_size(size, BufferManagerShmemSize());
119119
size = add_size(size, LockManagerShmemSize());
120120
size = add_size(size, PredicateLockShmemSize());
121121
size = add_size(size, ProcGlobalShmemSize());
@@ -132,7 +132,7 @@ CalculateShmemSize(int *num_semaphores)
132132
size = add_size(size, LWLockShmemSize());
133133
size = add_size(size, ProcArrayShmemSize());
134134
size = add_size(size, BackendStatusShmemSize());
135-
size = add_size(size, SInvalShmemSize());
135+
size = add_size(size, SharedInvalShmemSize());
136136
size = add_size(size, PMSignalShmemSize());
137137
size = add_size(size, ProcSignalShmemSize());
138138
size = add_size(size, CheckpointerShmemSize());
@@ -286,7 +286,7 @@ CreateOrAttachShmemStructs(void)
286286
CommitTsShmemInit();
287287
SUBTRANSShmemInit();
288288
MultiXactShmemInit();
289-
InitBufferPool();
289+
BufferManagerShmemInit();
290290

291291
/*
292292
* Set up lock manager
@@ -296,22 +296,22 @@ CreateOrAttachShmemStructs(void)
296296
/*
297297
* Set up predicate lock manager
298298
*/
299-
InitPredicateLocks();
299+
PredicateLockShmemInit();
300300

301301
/*
302302
* Set up process table
303303
*/
304304
if (!IsUnderPostmaster)
305305
InitProcGlobal();
306-
CreateSharedProcArray();
307-
CreateSharedBackendStatus();
306+
ProcArrayShmemInit();
307+
BackendStatusShmemInit();
308308
TwoPhaseShmemInit();
309309
BackgroundWorkerShmemInit();
310310

311311
/*
312312
* Set up shared-inval messaging
313313
*/
314-
CreateSharedInvalidationState();
314+
SharedInvalShmemInit();
315315

316316
/*
317317
* Set up interprocess signaling mechanisms

‎src/backend/storage/ipc/procarray.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static inline FullTransactionId FullXidRelativeTo(FullTransactionId rel,
370370
static void GlobalVisUpdateApply(ComputeXidHorizonsResult *horizons);
371371

372372
/*
373-
* Report shared-memory space needed by CreateSharedProcArray.
373+
* Report shared-memory space needed by ProcArrayShmemInit
374374
*/
375375
Size
376376
ProcArrayShmemSize(void)
@@ -415,7 +415,7 @@ ProcArrayShmemSize(void)
415415
* Initialize the shared PGPROC array during postmaster startup.
416416
*/
417417
void
418-
CreateSharedProcArray(void)
418+
ProcArrayShmemInit(void)
419419
{
420420
bool found;
421421

‎src/backend/storage/ipc/sinvaladt.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ static void CleanupInvalidationState(int status, Datum arg);
212212

213213

214214
/*
215-
* SInvalShmemSize --- return shared-memory space needed
215+
* SharedInvalShmemSize --- return shared-memory space needed
216216
*/
217217
Size
218-
SInvalShmemSize(void)
218+
SharedInvalShmemSize(void)
219219
{
220220
Size size;
221221

@@ -227,18 +227,18 @@ SInvalShmemSize(void)
227227
}
228228

229229
/*
230-
* CreateSharedInvalidationState
230+
* SharedInvalShmemInit
231231
* Create and initialize the SI message buffer
232232
*/
233233
void
234-
CreateSharedInvalidationState(void)
234+
SharedInvalShmemInit(void)
235235
{
236236
int i;
237237
bool found;
238238

239239
/* Allocate space in shared memory */
240240
shmInvalBuffer = (SISeg *)
241-
ShmemInitStruct("shmInvalBuffer", SInvalShmemSize(), &found);
241+
ShmemInitStruct("shmInvalBuffer", SharedInvalShmemSize(), &found);
242242
if (found)
243243
return;
244244

‎src/backend/storage/lmgr/predicate.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
* INTERFACE ROUTINES
154154
*
155155
* housekeeping for setting up shared memory predicate lock structures
156-
* InitPredicateLocks(void)
156+
* PredicateLockShmemInit(void)
157157
* PredicateLockShmemSize(void)
158158
*
159159
* predicate lock reporting
@@ -1127,7 +1127,7 @@ CheckPointPredicate(void)
11271127
/*------------------------------------------------------------------------*/
11281128

11291129
/*
1130-
* InitPredicateLocks -- Initialize the predicate locking data structures.
1130+
* PredicateLockShmemInit -- Initialize the predicate locking data structures.
11311131
*
11321132
* This is called from CreateSharedMemoryAndSemaphores(), which see for
11331133
* more comments. In the normal postmaster case, the shared hash tables
@@ -1137,7 +1137,7 @@ CheckPointPredicate(void)
11371137
* shared hash tables.
11381138
*/
11391139
void
1140-
InitPredicateLocks(void)
1140+
PredicateLockShmemInit(void)
11411141
{
11421142
HASHCTL info;
11431143
long max_table_size;

‎src/backend/utils/activity/backend_status.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static void pgstat_setup_backend_status_context(void);
7777

7878

7979
/*
80-
* Report shared-memory space needed by CreateSharedBackendStatus.
80+
* Report shared-memory space needed by BackendStatusShmemInit.
8181
*/
8282
Size
8383
BackendStatusShmemSize(void)
@@ -113,7 +113,7 @@ BackendStatusShmemSize(void)
113113
* during postmaster startup.
114114
*/
115115
void
116-
CreateSharedBackendStatus(void)
116+
BackendStatusShmemInit(void)
117117
{
118118
Size size;
119119
bool found;

‎src/backend/utils/init/postinit.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ BaseInit(void)
592592
/* Do local initialization of storage and buffer managers */
593593
InitSync();
594594
smgrinit();
595-
InitBufferPoolAccess();
595+
InitBufferManagerAccess();
596596

597597
/*
598598
* Initialize temporary file access after pgstat, so that the temporary

‎src/include/storage/bufmgr.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ extern Buffer ExtendBufferedRelTo(BufferManagerRelation bmr,
249249
BlockNumber extend_to,
250250
ReadBufferMode mode);
251251

252-
extern void InitBufferPoolAccess(void);
252+
extern void InitBufferManagerAccess(void);
253253
extern void AtEOXact_Buffers(bool isCommit);
254254
extern char *DebugPrintBufferRefcount(Buffer buffer);
255255
extern void CheckPointBuffers(int flags);
@@ -300,8 +300,8 @@ extern void LimitAdditionalLocalPins(uint32 *additional_pins);
300300
extern bool EvictUnpinnedBuffer(Buffer buf);
301301

302302
/* in buf_init.c */
303-
extern void InitBufferPool(void);
304-
extern Size BufferShmemSize(void);
303+
extern void BufferManagerShmemInit(void);
304+
extern Size BufferManagerShmemSize(void);
305305

306306
/* in localbuf.c */
307307
extern void AtProcExit_LocalBuffers(void);

‎src/include/storage/predicate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef void *SerializableXactHandle;
3737
*/
3838

3939
/* housekeeping for shared memory predicate lock structures */
40-
extern void InitPredicateLocks(void);
40+
extern void PredicateLockShmemInit(void);
4141
extern Size PredicateLockShmemSize(void);
4242

4343
extern void CheckPointPredicate(void);

‎src/include/storage/procarray.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
extern Size ProcArrayShmemSize(void);
24-
extern void CreateSharedProcArray(void);
24+
extern void ProcArrayShmemInit(void);
2525
extern void ProcArrayAdd(PGPROC *proc);
2626
extern void ProcArrayRemove(PGPROC *proc, TransactionId latestXid);
2727

‎src/include/storage/sinvaladt.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
/*
2929
* prototypes for functions in sinvaladt.c
3030
*/
31-
extern Size SInvalShmemSize(void);
32-
extern void CreateSharedInvalidationState(void);
31+
extern Size SharedInvalShmemSize(void);
32+
extern void SharedInvalShmemInit(void);
3333
extern void SharedInvalBackendInit(bool sendOnly);
3434

3535
extern void SIInsertDataEntries(const SharedInvalidationMessage *data, int n);

‎src/include/utils/backend_status.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ extern PGDLLIMPORT PgBackendStatus *MyBEEntry;
299299
* ----------
300300
*/
301301
extern Size BackendStatusShmemSize(void);
302-
extern void CreateSharedBackendStatus(void);
302+
extern void BackendStatusShmemInit(void);
303303

304304

305305
/* ----------

0 commit comments

Comments
 (0)