From ae8d12bab05ede48166d15312b222e046aae14a0 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 22 Jul 2024 13:23:59 +0300 Subject: [PATCH 3/8] Set MyProc->heldLocks in ProcSleep Previously, the ProcSleep() caller was respnsible for setting it, and we had comments to remind about that. But it seems simpler to make ProcSleep() itself responsible for it. ProcSleep() already set the other info about the lock its waiting for (waitLock, waitProcLock and waitLockMode), so seems natural for it to set heldLocks too. --- src/backend/storage/lmgr/lock.c | 8 -------- src/backend/storage/lmgr/proc.c | 10 ++++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 7eb5c2e5226..489073259b6 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -1047,11 +1047,6 @@ LockAcquireExtended(const LOCKTAG *locktag, } else { - /* - * Set bitmask of locks this process already holds on this object. - */ - MyProc->heldLocks = proclock->holdMask; - /* * Sleep till someone wakes me up. We do this even in the dontWait * case, because while trying to go to sleep, we may discover that we @@ -1808,9 +1803,6 @@ MarkLockClear(LOCALLOCK *locallock) /* * WaitOnLock -- wait to acquire a lock * - * Caller must have set MyProc->heldLocks to reflect locks already held - * on the lockable object by this process. - * * The appropriate partition lock must be held at entry, and will still be * held at exit. */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 1b23efb26f3..5c1d2792c3d 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -1040,9 +1040,6 @@ AuxiliaryPidGetProc(int pid) /* * ProcSleep -- put a process to sleep on the specified lock * - * Caller must have set MyProc->heldLocks to reflect locks already held - * on the lockable object by this process (under all XIDs). - * * It's not actually guaranteed that we need to wait when this function is * called, because it could be that when we try to find a position at which * to insert ourself into the wait queue, we discover that we must be inserted @@ -1072,7 +1069,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable, bool dontWait) LWLock *partitionLock = LockHashPartitionLock(hashcode); dclist_head *waitQueue = &lock->waitProcs; PGPROC *insert_before = NULL; - LOCKMASK myHeldLocks = MyProc->heldLocks; + LOCKMASK myHeldLocks; TimestampTz standbyWaitStart = 0; bool early_deadlock = false; bool allow_autovacuum_cancel = true; @@ -1080,6 +1077,11 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable, bool dontWait) ProcWaitStatus myWaitStatus; PGPROC *leader = MyProc->lockGroupLeader; + /* + * Set bitmask of locks this process already holds on this object. + */ + myHeldLocks = MyProc->heldLocks = proclock->holdMask; + /* * If group locking is in use, locks held by members of my locking group * need to be included in myHeldLocks. This is not required for relation -- 2.39.2