From 478846e7688c9ab73d2695a66822e9ae0574b551 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 29 Aug 2024 09:46:21 +0300 Subject: [PATCH] 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 --- src/backend/storage/buffer/buf_init.c | 6 +++--- src/backend/storage/buffer/bufmgr.c | 2 +- src/backend/storage/buffer/freelist.c | 2 +- src/backend/storage/ipc/ipci.c | 14 +++++++------- src/backend/storage/ipc/procarray.c | 4 ++-- src/backend/storage/ipc/sinvaladt.c | 10 +++++----- src/backend/storage/lmgr/predicate.c | 6 +++--- src/backend/utils/activity/backend_status.c | 4 ++-- src/backend/utils/init/postinit.c | 2 +- src/include/storage/bufmgr.h | 6 +++--- src/include/storage/predicate.h | 2 +- src/include/storage/procarray.h | 2 +- src/include/storage/sinvaladt.h | 4 ++-- src/include/utils/backend_status.h | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index 46116a1f64b..09bec6449b6 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -65,7 +65,7 @@ CkptSortItem *CkptBufferIds; * postmaster, or in a standalone backend). */ void -InitBufferPool(void) +BufferManagerShmemInit(void) { bool foundBufs, foundDescs, @@ -151,13 +151,13 @@ InitBufferPool(void) } /* - * BufferShmemSize + * BufferManagerShmemSize * * compute the size of shared memory for the buffer pool including * data pages, buffer descriptors, hash tables, etc. */ Size -BufferShmemSize(void) +BufferManagerShmemSize(void) { Size size = 0; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index fb38c7bdd45..5cdd2f10fc8 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3582,7 +3582,7 @@ AtEOXact_Buffers(bool isCommit) * buffer pool. */ void -InitBufferPoolAccess(void) +InitBufferManagerAccess(void) { HASHCTL hash_ctl; diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 19797de31a9..dffdd57e9b5 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -506,7 +506,7 @@ StrategyInitialize(bool init) /* * Grab the whole linked list of free buffers for our strategy. We - * assume it was previously set up by InitBufferPool(). + * assume it was previously set up by BufferManagerShmemInit(). */ StrategyControl->firstFreeBuffer = 0; StrategyControl->lastFreeBuffer = NBuffers - 1; diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 8f8a89124e8..6caeca3a8e6 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -115,7 +115,7 @@ CalculateShmemSize(int *num_semaphores) sizeof(ShmemIndexEnt))); size = add_size(size, dsm_estimate_size()); size = add_size(size, DSMRegistryShmemSize()); - size = add_size(size, BufferShmemSize()); + size = add_size(size, BufferManagerShmemSize()); size = add_size(size, LockManagerShmemSize()); size = add_size(size, PredicateLockShmemSize()); size = add_size(size, ProcGlobalShmemSize()); @@ -132,7 +132,7 @@ CalculateShmemSize(int *num_semaphores) size = add_size(size, LWLockShmemSize()); size = add_size(size, ProcArrayShmemSize()); size = add_size(size, BackendStatusShmemSize()); - size = add_size(size, SInvalShmemSize()); + size = add_size(size, SharedInvalShmemSize()); size = add_size(size, PMSignalShmemSize()); size = add_size(size, ProcSignalShmemSize()); size = add_size(size, CheckpointerShmemSize()); @@ -286,7 +286,7 @@ CreateOrAttachShmemStructs(void) CommitTsShmemInit(); SUBTRANSShmemInit(); MultiXactShmemInit(); - InitBufferPool(); + BufferManagerShmemInit(); /* * Set up lock manager @@ -296,22 +296,22 @@ CreateOrAttachShmemStructs(void) /* * Set up predicate lock manager */ - InitPredicateLocks(); + PredicateLockShmemInit(); /* * Set up process table */ if (!IsUnderPostmaster) InitProcGlobal(); - CreateSharedProcArray(); - CreateSharedBackendStatus(); + ProcArrayShmemInit(); + BackendStatusShmemInit(); TwoPhaseShmemInit(); BackgroundWorkerShmemInit(); /* * Set up shared-inval messaging */ - CreateSharedInvalidationState(); + SharedInvalShmemInit(); /* * Set up interprocess signaling mechanisms diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index af3b15e93df..36610a1c7e7 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -370,7 +370,7 @@ static inline FullTransactionId FullXidRelativeTo(FullTransactionId rel, static void GlobalVisUpdateApply(ComputeXidHorizonsResult *horizons); /* - * Report shared-memory space needed by CreateSharedProcArray. + * Report shared-memory space needed by ProcArrayShmemInit */ Size ProcArrayShmemSize(void) @@ -415,7 +415,7 @@ ProcArrayShmemSize(void) * Initialize the shared PGPROC array during postmaster startup. */ void -CreateSharedProcArray(void) +ProcArrayShmemInit(void) { bool found; diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index b486d8ddd1d..db59637c438 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -212,10 +212,10 @@ static void CleanupInvalidationState(int status, Datum arg); /* - * SInvalShmemSize --- return shared-memory space needed + * SharedInvalShmemSize --- return shared-memory space needed */ Size -SInvalShmemSize(void) +SharedInvalShmemSize(void) { Size size; @@ -227,18 +227,18 @@ SInvalShmemSize(void) } /* - * CreateSharedInvalidationState + * SharedInvalShmemInit * Create and initialize the SI message buffer */ void -CreateSharedInvalidationState(void) +SharedInvalShmemInit(void) { int i; bool found; /* Allocate space in shared memory */ shmInvalBuffer = (SISeg *) - ShmemInitStruct("shmInvalBuffer", SInvalShmemSize(), &found); + ShmemInitStruct("shmInvalBuffer", SharedInvalShmemSize(), &found); if (found) return; diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index b455b78f9f7..e24a0f2fdbd 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -153,7 +153,7 @@ * INTERFACE ROUTINES * * housekeeping for setting up shared memory predicate lock structures - * InitPredicateLocks(void) + * PredicateLockShmemInit(void) * PredicateLockShmemSize(void) * * predicate lock reporting @@ -1127,7 +1127,7 @@ CheckPointPredicate(void) /*------------------------------------------------------------------------*/ /* - * InitPredicateLocks -- Initialize the predicate locking data structures. + * PredicateLockShmemInit -- Initialize the predicate locking data structures. * * This is called from CreateSharedMemoryAndSemaphores(), which see for * more comments. In the normal postmaster case, the shared hash tables @@ -1137,7 +1137,7 @@ CheckPointPredicate(void) * shared hash tables. */ void -InitPredicateLocks(void) +PredicateLockShmemInit(void) { HASHCTL info; long max_table_size; diff --git a/src/backend/utils/activity/backend_status.c b/src/backend/utils/activity/backend_status.c index 1ccf4c6d839..34a55e2177d 100644 --- a/src/backend/utils/activity/backend_status.c +++ b/src/backend/utils/activity/backend_status.c @@ -77,7 +77,7 @@ static void pgstat_setup_backend_status_context(void); /* - * Report shared-memory space needed by CreateSharedBackendStatus. + * Report shared-memory space needed by BackendStatusShmemInit. */ Size BackendStatusShmemSize(void) @@ -113,7 +113,7 @@ BackendStatusShmemSize(void) * during postmaster startup. */ void -CreateSharedBackendStatus(void) +BackendStatusShmemInit(void) { Size size; bool found; diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 04a47d6e704..3b50ce19a2c 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -592,7 +592,7 @@ BaseInit(void) /* Do local initialization of storage and buffer managers */ InitSync(); smgrinit(); - InitBufferPoolAccess(); + InitBufferManagerAccess(); /* * Initialize temporary file access after pgstat, so that the temporary diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index c8422571b7f..eb0fba4230b 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -249,7 +249,7 @@ extern Buffer ExtendBufferedRelTo(BufferManagerRelation bmr, BlockNumber extend_to, ReadBufferMode mode); -extern void InitBufferPoolAccess(void); +extern void InitBufferManagerAccess(void); extern void AtEOXact_Buffers(bool isCommit); extern char *DebugPrintBufferRefcount(Buffer buffer); extern void CheckPointBuffers(int flags); @@ -300,8 +300,8 @@ extern void LimitAdditionalLocalPins(uint32 *additional_pins); extern bool EvictUnpinnedBuffer(Buffer buf); /* in buf_init.c */ -extern void InitBufferPool(void); -extern Size BufferShmemSize(void); +extern void BufferManagerShmemInit(void); +extern Size BufferManagerShmemSize(void); /* in localbuf.c */ extern void AtProcExit_LocalBuffers(void); diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h index 14ee9b94a2f..d5c14986e24 100644 --- a/src/include/storage/predicate.h +++ b/src/include/storage/predicate.h @@ -37,7 +37,7 @@ typedef void *SerializableXactHandle; */ /* housekeeping for shared memory predicate lock structures */ -extern void InitPredicateLocks(void); +extern void PredicateLockShmemInit(void); extern Size PredicateLockShmemSize(void); extern void CheckPointPredicate(void); diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index 8ca60504622..56af0b40b32 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -21,7 +21,7 @@ extern Size ProcArrayShmemSize(void); -extern void CreateSharedProcArray(void); +extern void ProcArrayShmemInit(void); extern void ProcArrayAdd(PGPROC *proc); extern void ProcArrayRemove(PGPROC *proc, TransactionId latestXid); diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index c3c97b3f8b7..c9d175b634d 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -28,8 +28,8 @@ /* * prototypes for functions in sinvaladt.c */ -extern Size SInvalShmemSize(void); -extern void CreateSharedInvalidationState(void); +extern Size SharedInvalShmemSize(void); +extern void SharedInvalShmemInit(void); extern void SharedInvalBackendInit(bool sendOnly); extern void SIInsertDataEntries(const SharedInvalidationMessage *data, int n); diff --git a/src/include/utils/backend_status.h b/src/include/utils/backend_status.h index 7b7f6f59d07..97874300c31 100644 --- a/src/include/utils/backend_status.h +++ b/src/include/utils/backend_status.h @@ -299,7 +299,7 @@ extern PGDLLIMPORT PgBackendStatus *MyBEEntry; * ---------- */ extern Size BackendStatusShmemSize(void); -extern void CreateSharedBackendStatus(void); +extern void BackendStatusShmemInit(void); /* ---------- -- 2.30.2