From 70d0457b7c9527bf1304921b367a34e49d26fd6e Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 7 Nov 2025 16:51:52 -0500 Subject: [PATCH v6 02/14] bufmgr: Turn BUFFER_LOCK_* into an enum This way we will be able to benefit from compiler-warnings for code using a switch() over all lock modes. Discussion: https://postgr.es/m/fvfmkr5kk4nyex56ejgxj3uzi63isfxovp2biecb4bspbjrze7@az2pljabhnff --- src/include/storage/bufmgr.h | 13 ++++++++----- src/backend/storage/buffer/bufmgr.c | 4 ++-- src/tools/pgindent/typedefs.list | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index b5f8f3c5d42..5fc3de20abc 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -200,9 +200,12 @@ extern PGDLLIMPORT int32 *LocalRefCount; /* * Buffer content lock modes (mode argument for LockBuffer()) */ -#define BUFFER_LOCK_UNLOCK 0 -#define BUFFER_LOCK_SHARE 1 -#define BUFFER_LOCK_EXCLUSIVE 2 +typedef enum BufferLockMode +{ + BUFFER_LOCK_UNLOCK, + BUFFER_LOCK_SHARE, + BUFFER_LOCK_EXCLUSIVE, +} BufferLockMode; /* @@ -238,7 +241,7 @@ extern void WaitReadBuffers(ReadBuffersOperation *operation); extern void ReleaseBuffer(Buffer buffer); extern void UnlockReleaseBuffer(Buffer buffer); extern bool BufferIsLockedByMe(Buffer buffer); -extern bool BufferIsLockedByMeInMode(Buffer buffer, int mode); +extern bool BufferIsLockedByMeInMode(Buffer buffer, BufferLockMode mode); extern bool BufferIsDirty(Buffer buffer); extern void MarkBufferDirty(Buffer buffer); extern void IncrBufferRefCount(Buffer buffer); @@ -299,7 +302,7 @@ extern void BufferGetTag(Buffer buffer, RelFileLocator *rlocator, extern void MarkBufferDirtyHint(Buffer buffer, bool buffer_std); extern void UnlockBuffers(void); -extern void LockBuffer(Buffer buffer, int mode); +extern void LockBuffer(Buffer buffer, BufferLockMode mode); extern bool ConditionalLockBuffer(Buffer buffer); extern void LockBufferForCleanup(Buffer buffer); extern bool ConditionalLockBufferForCleanup(Buffer buffer); diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 327ddb7adc8..b682878b1fb 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -2866,7 +2866,7 @@ BufferIsLockedByMe(Buffer buffer) * Buffer must be pinned. */ bool -BufferIsLockedByMeInMode(Buffer buffer, int mode) +BufferIsLockedByMeInMode(Buffer buffer, BufferLockMode mode) { BufferDesc *bufHdr; @@ -5601,7 +5601,7 @@ UnlockBuffers(void) * Acquire or release the content_lock for the buffer. */ void -LockBuffer(Buffer buffer, int mode) +LockBuffer(Buffer buffer, BufferLockMode mode) { BufferDesc *buf; diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 57f2a9ccdc5..5769227e41c 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -345,6 +345,7 @@ BufferCachePagesRec BufferDesc BufferDescPadded BufferHeapTupleTableSlot +BufferLockMode BufferLookupEnt BufferManagerRelation BufferStrategyControl -- 2.48.1.76.g4e746b1a31.dirty