提交 1247ea28 编写于 作者: A Alvaro Herrera

Remove `proc` argument from LockCheckConflicts

This has been unused since commit 8563ccae.

Noted by Antonin Houska
上级 dd778e9d
...@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag, ...@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
status = STATUS_FOUND; status = STATUS_FOUND;
else else
status = LockCheckConflicts(lockMethodTable, lockmode, status = LockCheckConflicts(lockMethodTable, lockmode,
lock, proclock, MyProc); lock, proclock);
if (status == STATUS_OK) if (status == STATUS_OK)
{ {
...@@ -1256,8 +1256,7 @@ int ...@@ -1256,8 +1256,7 @@ int
LockCheckConflicts(LockMethod lockMethodTable, LockCheckConflicts(LockMethod lockMethodTable,
LOCKMODE lockmode, LOCKMODE lockmode,
LOCK *lock, LOCK *lock,
PROCLOCK *proclock, PROCLOCK *proclock)
PGPROC *proc)
{ {
int numLockModes = lockMethodTable->numLockModes; int numLockModes = lockMethodTable->numLockModes;
LOCKMASK myLocks; LOCKMASK myLocks;
......
...@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable) ...@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
LockCheckConflicts(lockMethodTable, LockCheckConflicts(lockMethodTable,
lockmode, lockmode,
lock, lock,
proclock, proclock) == STATUS_OK)
MyProc) == STATUS_OK)
{ {
/* Skip the wait and just grant myself the lock. */ /* Skip the wait and just grant myself the lock. */
GrantLock(lock, proclock, lockmode); GrantLock(lock, proclock, lockmode);
...@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock) ...@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock)
LockCheckConflicts(lockMethodTable, LockCheckConflicts(lockMethodTable,
lockmode, lockmode,
lock, lock,
proc->waitProcLock, proc->waitProcLock) == STATUS_OK)
proc) == STATUS_OK)
{ {
/* OK to waken */ /* OK to waken */
GrantLock(lock, proc->waitProcLock, lockmode); GrantLock(lock, proc->waitProcLock, lockmode);
......
...@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void); ...@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);
extern void PostPrepare_Locks(TransactionId xid); extern void PostPrepare_Locks(TransactionId xid);
extern int LockCheckConflicts(LockMethod lockMethodTable, extern int LockCheckConflicts(LockMethod lockMethodTable,
LOCKMODE lockmode, LOCKMODE lockmode,
LOCK *lock, PROCLOCK *proclock, PGPROC *proc); LOCK *lock, PROCLOCK *proclock);
extern void GrantLock(LOCK *lock, PROCLOCK *proclock, LOCKMODE lockmode); extern void GrantLock(LOCK *lock, PROCLOCK *proclock, LOCKMODE lockmode);
extern void GrantAwaitedLock(void); extern void GrantAwaitedLock(void);
extern void RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode); extern void RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册