agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v2] Fix DROP PROPERTY GRAPH "unsupported object class" error 93+ messages / 2 participants [nested] [flat]
* [PATCH v2] Fix DROP PROPERTY GRAPH "unsupported object class" error @ 2026-04-23 09:27 Bertrand Drouvot <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Bertrand Drouvot @ 2026-04-23 09:27 UTC (permalink / raw) getObjectTypeDescription() and getObjectIdentityParts() are missing switch cases for PropgraphElementLabelRelationId and PropgraphLabelPropertyRelationId, causing them to hit the default case and error out with "unsupported object class". During DROP PROPERTY GRAPH, this manifests when an event trigger is active, because pg_event_trigger_ddl_commands() calls these functions. The same code paths are also reachable via pg_identify_object() and pg_identify_object_as_address(). This commit adds the missing cases. Test coverage is added in object_address.sql for these two catalog types via the zero-OID test that exercises pg_identify_object() and pg_identify_object_as_address(). A test in event_trigger.sql verifies that DROP PROPERTY GRAPH works correctly when an event trigger is active. Author: Bertrand Drouvot <[email protected]> Reviewed-by: Michael Paquier <[email protected]> Reviewed-by: Ashutosh Bapat <[email protected]> Discussion: https://postgr.es/m/aej1DkLwhyZWmtxJ@bdtpg --- src/backend/catalog/objectaddress.c | 93 ++++++++++++++++++++ src/test/regress/expected/event_trigger.out | 17 ++++ src/test/regress/expected/object_address.out | 4 + src/test/regress/sql/event_trigger.sql | 13 +++ src/test/regress/sql/object_address.sql | 2 + 5 files changed, 129 insertions(+) 62.4% src/backend/catalog/ 25.6% src/test/regress/expected/ 11.8% src/test/regress/sql/ diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index c1862809577..e2d6d8f71f6 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -4901,10 +4901,18 @@ getObjectTypeDescription(const ObjectAddress *object, bool missing_ok) appendStringInfoString(&buffer, "policy"); break; + case PropgraphElementLabelRelationId: + appendStringInfoString(&buffer, "property graph element label"); + break; + case PropgraphElementRelationId: appendStringInfoString(&buffer, "property graph element"); break; + case PropgraphLabelPropertyRelationId: + appendStringInfoString(&buffer, "property graph label property"); + break; + case PropgraphLabelRelationId: appendStringInfoString(&buffer, "property graph label"); break; @@ -6161,6 +6169,49 @@ getObjectIdentityParts(const ObjectAddress *object, break; } + case PropgraphElementLabelRelationId: + { + Relation ellabelDesc; + ScanKeyData skey[1]; + SysScanDesc ellabelscan; + HeapTuple tup; + Form_pg_propgraph_element_label pgelform; + ObjectAddress oa; + + ellabelDesc = table_open(PropgraphElementLabelRelationId, AccessShareLock); + ScanKeyInit(&skey[0], + Anum_pg_propgraph_element_label_oid, + BTEqualStrategyNumber, F_OIDEQ, + ObjectIdGetDatum(object->objectId)); + + ellabelscan = systable_beginscan(ellabelDesc, + PropgraphElementLabelObjectIndexId, + true, NULL, 1, skey); + + tup = systable_getnext(ellabelscan); + if (!HeapTupleIsValid(tup)) + { + if (!missing_ok) + elog(ERROR, "could not find tuple for element label %u", + object->objectId); + + systable_endscan(ellabelscan); + table_close(ellabelDesc, AccessShareLock); + break; + } + + pgelform = (Form_pg_propgraph_element_label) GETSTRUCT(tup); + + ObjectAddressSet(oa, PropgraphElementRelationId, pgelform->pgelelid); + + appendStringInfoString(&buffer, getObjectIdentityParts(&oa, objname, + objargs, false)); + + systable_endscan(ellabelscan); + table_close(ellabelDesc, AccessShareLock); + break; + } + case PropgraphElementRelationId: { HeapTuple tup; @@ -6184,6 +6235,48 @@ getObjectIdentityParts(const ObjectAddress *object, break; } + case PropgraphLabelPropertyRelationId: + { + Relation lblpropDesc; + ScanKeyData skey[1]; + SysScanDesc lblpropscan; + HeapTuple tup; + Form_pg_propgraph_label_property plpform; + ObjectAddress oa; + + lblpropDesc = table_open(PropgraphLabelPropertyRelationId, + AccessShareLock); + ScanKeyInit(&skey[0], + Anum_pg_propgraph_label_property_oid, + BTEqualStrategyNumber, F_OIDEQ, + ObjectIdGetDatum(object->objectId)); + + lblpropscan = systable_beginscan(lblpropDesc, PropgraphLabelPropertyObjectIndexId, + true, NULL, 1, skey); + + tup = systable_getnext(lblpropscan); + if (!HeapTupleIsValid(tup)) + { + if (!missing_ok) + elog(ERROR, "could not find tuple for label property %u", + object->objectId); + + systable_endscan(lblpropscan); + table_close(lblpropDesc, AccessShareLock); + break; + } + + plpform = (Form_pg_propgraph_label_property) GETSTRUCT(tup); + + ObjectAddressSet(oa, PropgraphElementLabelRelationId, plpform->plpellabelid); + appendStringInfoString(&buffer, getObjectIdentityParts(&oa, objname, + objargs, false)); + + systable_endscan(lblpropscan); + table_close(lblpropDesc, AccessShareLock); + break; + } + case PropgraphLabelRelationId: { HeapTuple tup; diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out index 065f586310f..ed8d5df397e 100644 --- a/src/test/regress/expected/event_trigger.out +++ b/src/test/regress/expected/event_trigger.out @@ -173,6 +173,23 @@ NOTICE: test_event_trigger: ddl_command_end CREATE USER MAPPING alter default privileges for role regress_evt_user revoke delete on tables from regress_evt_user; NOTICE: test_event_trigger: ddl_command_end ALTER DEFAULT PRIVILEGES +-- DROP PROPERTY GRAPH should work with event trigger in place +CREATE TABLE t1x (a int PRIMARY KEY, b text); +NOTICE: test_event_trigger: ddl_command_start CREATE TABLE +NOTICE: test_event_trigger: ddl_command_end CREATE TABLE +CREATE TABLE t2x (i int PRIMARY KEY, j text); +NOTICE: test_event_trigger: ddl_command_start CREATE TABLE +NOTICE: test_event_trigger: ddl_command_end CREATE TABLE +CREATE PROPERTY GRAPH gx + VERTEX TABLES ( + t1x KEY (a) LABEL l1 PROPERTIES (b AS p1), + t2x KEY (i) LABEL l2 PROPERTIES (j AS p1) +); +NOTICE: test_event_trigger: ddl_command_end CREATE PROPERTY GRAPH +DROP PROPERTY GRAPH gx; +NOTICE: test_event_trigger: ddl_command_end DROP PROPERTY GRAPH +DROP TABLE t1x, t2x; +NOTICE: test_event_trigger: ddl_command_end DROP TABLE -- alter owner to non-superuser should fail alter event trigger regress_event_trigger owner to regress_evt_user; ERROR: permission denied to change owner of event trigger "regress_event_trigger" diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out index 97227d67a54..729c3537f25 100644 --- a/src/test/regress/expected/object_address.out +++ b/src/test/regress/expected/object_address.out @@ -593,7 +593,9 @@ WITH objects (classid, objid, objsubid) AS (VALUES ('pg_parameter_acl'::regclass, 0, 0), -- no parameter ACL ('pg_policy'::regclass, 0, 0), -- no policy ('pg_propgraph_element'::regclass, 0, 0), -- no property graph element + ('pg_propgraph_element_label'::regclass, 0, 0), -- no property graph element label ('pg_propgraph_label'::regclass, 0, 0), -- no property graph label + ('pg_propgraph_label_property'::regclass, 0, 0), -- no property graph label property ('pg_propgraph_property'::regclass, 0, 0), -- no property graph property ('pg_publication'::regclass, 0, 0), -- no publication ('pg_publication_namespace'::regclass, 0, 0), -- no publication namespace @@ -653,6 +655,8 @@ ORDER BY objects.classid, objects.objid, objects.objsubid; ("(""parameter ACL"",,,)")|("(""parameter ACL"",,)")|NULL ("(""property graph element"",,,)")|("(""property graph element"",,)")|NULL ("(""property graph label"",,,)")|("(""property graph label"",,)")|NULL +("(""property graph element label"",,,)")|("(""property graph element label"",,)")|NULL ("(""property graph property"",,,)")|("(""property graph property"",,)")|NULL +("(""property graph label property"",,,)")|("(""property graph label property"",,)")|NULL -- restore normal output mode \a\t diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql index 32e9bb58c5e..271f443378b 100644 --- a/src/test/regress/sql/event_trigger.sql +++ b/src/test/regress/sql/event_trigger.sql @@ -143,6 +143,19 @@ create user mapping for regress_evt_user server useless_server; alter default privileges for role regress_evt_user revoke delete on tables from regress_evt_user; +-- DROP PROPERTY GRAPH should work with event trigger in place +CREATE TABLE t1x (a int PRIMARY KEY, b text); +CREATE TABLE t2x (i int PRIMARY KEY, j text); + +CREATE PROPERTY GRAPH gx + VERTEX TABLES ( + t1x KEY (a) LABEL l1 PROPERTIES (b AS p1), + t2x KEY (i) LABEL l2 PROPERTIES (j AS p1) +); + +DROP PROPERTY GRAPH gx; +DROP TABLE t1x, t2x; + -- alter owner to non-superuser should fail alter event trigger regress_event_trigger owner to regress_evt_user; diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql index 1bbe9457c1c..620dacf1045 100644 --- a/src/test/regress/sql/object_address.sql +++ b/src/test/regress/sql/object_address.sql @@ -282,7 +282,9 @@ WITH objects (classid, objid, objsubid) AS (VALUES ('pg_parameter_acl'::regclass, 0, 0), -- no parameter ACL ('pg_policy'::regclass, 0, 0), -- no policy ('pg_propgraph_element'::regclass, 0, 0), -- no property graph element + ('pg_propgraph_element_label'::regclass, 0, 0), -- no property graph element label ('pg_propgraph_label'::regclass, 0, 0), -- no property graph label + ('pg_propgraph_label_property'::regclass, 0, 0), -- no property graph label property ('pg_propgraph_property'::regclass, 0, 0), -- no property graph property ('pg_publication'::regclass, 0, 0), -- no publication ('pg_publication_namespace'::regclass, 0, 0), -- no publication namespace -- 2.34.1 --gtUR827Uq8d5gVsQ-- ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
* [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait @ 2026-07-22 15:32 Nathan Bossart <[email protected]> 0 siblings, 0 replies; 93+ messages in thread From: Nathan Bossart @ 2026-07-22 15:32 UTC (permalink / raw) --- src/backend/storage/buffer/bufmgr.c | 16 ++++++++-------- src/backend/storage/lmgr/proc.c | 20 ++++++++++---------- src/include/storage/proc.h | 9 +++++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 3908529872a..a85547fa492 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -6806,12 +6806,12 @@ LockBufferForCleanup(Buffer buffer) if (log_recovery_conflict_waits && waitStart == 0) waitStart = GetCurrentTimestamp(); - /* Publish the bufid that Startup process waits on */ - SetStartupBufferPinWaitBufId(buffer - 1); + /* Publish the buffer that Startup process waits on */ + SetStartupBufferPinWaitBuf(buffer); /* Set alarm and then wait to be signaled by UnpinBuffer() */ ResolveRecoveryConflictWithBufferPin(); - /* Reset the published bufid */ - SetStartupBufferPinWaitBufId(-1); + /* Reset the published buffer */ + SetStartupBufferPinWaitBuf(InvalidBuffer); } else ProcWaitForSignal(WAIT_EVENT_BUFFER_CLEANUP); @@ -6865,18 +6865,18 @@ cleanup_lock_acquired: bool HoldingBufferPinThatDelaysRecovery(void) { - int bufid = GetStartupBufferPinWaitBufId(); + Buffer buffer = GetStartupBufferPinWaitBuf(); /* * If we get woken slowly then it's possible that the Startup process was * already woken by other backends before we got here. Also possible that * we get here by multiple interrupts or interrupts at inappropriate - * times, so make sure we do nothing if the bufid is not set. + * times, so make sure we do nothing if the buffer is not set. */ - if (bufid < 0) + if (buffer == InvalidBuffer) return false; - if (GetPrivateRefCount(bufid + 1) > 0) + if (GetPrivateRefCount(buffer) > 0) return true; return false; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 9d6e69175a5..f973494abb1 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -239,7 +239,7 @@ ProcGlobalShmemInit(void *arg) dlist_init(&ProcGlobal->autovacFreeProcs); dlist_init(&ProcGlobal->bgworkerFreeProcs); dlist_init(&ProcGlobal->walsenderFreeProcs); - ProcGlobal->startupBufferPinWaitBufId = -1; + ProcGlobal->startupBufferPinWaitBuf = InvalidBuffer; pg_atomic_init_u32(&ProcGlobal->avLauncherProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->walwriterProc, INVALID_PROC_NUMBER); pg_atomic_init_u32(&ProcGlobal->checkpointerProc, INVALID_PROC_NUMBER); @@ -760,30 +760,30 @@ InitAuxiliaryProcess(void) /* * Used from bufmgr to share the value of the buffer that Startup waits on, - * or to reset the value to "not waiting" (-1). This allows processing - * of recovery conflicts for buffer pins. Set is made before backends look - * at this value, so locking not required, especially since the set is - * an atomic integer set operation. + * or to reset the value to "not waiting" (InvalidBuffer). This allows + * processing of recovery conflicts for buffer pins. Set is made before + * backends look at this value, so locking not required, especially since + * the set is an atomic integer set operation. */ void -SetStartupBufferPinWaitBufId(int bufid) +SetStartupBufferPinWaitBuf(Buffer buffer) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - procglobal->startupBufferPinWaitBufId = bufid; + procglobal->startupBufferPinWaitBuf = buffer; } /* * Used by backends when they receive a request to check for buffer pin waits. */ -int -GetStartupBufferPinWaitBufId(void) +Buffer +GetStartupBufferPinWaitBuf(void) { /* use volatile pointer to prevent code rearrangement */ volatile PROC_HDR *procglobal = ProcGlobal; - return procglobal->startupBufferPinWaitBufId; + return procglobal->startupBufferPinWaitBuf; } /* diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 03a1a466fa8..4c3f431b4eb 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -17,6 +17,7 @@ #include "access/xlogdefs.h" #include "lib/ilist.h" #include "miscadmin.h" +#include "storage/buf.h" #include "storage/latch.h" #include "storage/lock.h" #include "storage/pg_sema.h" @@ -498,8 +499,8 @@ typedef struct PROC_HDR /* Current shared estimate of appropriate spins_per_delay value */ int spins_per_delay; - /* Buffer id of the buffer that Startup process waits for pin on, or -1 */ - int startupBufferPinWaitBufId; + /* Buffer that Startup process waits for pin on, or InvalidBuffer */ + Buffer startupBufferPinWaitBuf; } PROC_HDR; extern PGDLLIMPORT PROC_HDR *ProcGlobal; @@ -558,8 +559,8 @@ extern void InitProcess(void); extern void InitProcessPhase2(void); extern void InitAuxiliaryProcess(void); -extern void SetStartupBufferPinWaitBufId(int bufid); -extern int GetStartupBufferPinWaitBufId(void); +extern void SetStartupBufferPinWaitBuf(Buffer buffer); +extern Buffer GetStartupBufferPinWaitBuf(void); extern bool HaveNFreeProcs(int n, int *nfree); extern void ProcReleaseLocks(bool isCommit); -- 2.50.1 (Apple Git-155) --Xf36GNcW+0xZNily Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=v2-0005-convert-PROC_HDR-startupBufferPinWaitBuf-to-an-at.patch ^ permalink raw reply [nested|flat] 93+ messages in thread
end of thread, other threads:[~2026-07-22 15:32 UTC | newest] Thread overview: 93+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-04-23 09:27 [PATCH v2] Fix DROP PROPERTY GRAPH "unsupported object class" error Bertrand Drouvot <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]> 2026-07-22 15:32 [PATCH v2 4/9] use Buffer instead of buffer ID for startup's buffer pin wait Nathan Bossart <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox