mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove proc argument from LockCheckConflicts

Browse Source 
This has been unused since commit 8563ccae2caf.

Noted by Antonin Houska
This commit is contained in:
Alvaro Herrera 2013-09-16 22:14:14 -03:00
parent dd778e9d88
commit 1247ea28cb
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/storage/lmgr/lock.c
View File

@ -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
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;

6
src/backend/storage/lmgr/proc.c
View File

@ -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)
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);

2
src/include/storage/lock.h
View File

@ -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);