Commit1247ea2

committed

Removeproc argument from LockCheckConflicts

This has been unused since commit8563cca.Noted by Antonin Houska

1 parentdd778e9 commit1247ea2Copy full SHA for 1247ea2

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag,`
`906`	`906`	`status=STATUS_FOUND;`
`907`	`907`	`else`
`908`	`908`	`status=LockCheckConflicts(lockMethodTable,lockmode,`
`909`		`-lock,proclock,MyProc);`
	`909`	`+lock,proclock);`
`910`	`910`
`911`	`911`	`if (status==STATUS_OK)`
`912`	`912`	`{`
`@@ -1256,8 +1256,7 @@ int`
`1256`	`1256`	`LockCheckConflicts(LockMethodlockMethodTable,`
`1257`	`1257`	`LOCKMODElockmode,`
`1258`	`1258`	`LOCK*lock,`
`1259`		`-PROCLOCK*proclock,`
`1260`		`-PGPROC*proc)`
	`1259`	`+PROCLOCK*proclock)`
`1261`	`1260`	`{`
`1262`	`1261`	`intnumLockModes=lockMethodTable->numLockModes;`
`1263`	`1262`	`LOCKMASKmyLocks;`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)`
`997`	`997`	`LockCheckConflicts(lockMethodTable,`
`998`	`998`	`lockmode,`
`999`	`999`	`lock,`
`1000`		`-proclock,`
`1001`		`-MyProc)==STATUS_OK)`
	`1000`	`+proclock)==STATUS_OK)`
`1002`	`1001`	`{`
`1003`	`1002`	`/* Skip the wait and just grant myself the lock. */`
`1004`	`1003`	`GrantLock(lock,proclock,lockmode);`
`@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock)`
`1384`	`1383`	`LockCheckConflicts(lockMethodTable,`
`1385`	`1384`	`lockmode,`
`1386`	`1385`	`lock,`
`1387`		`-proc->waitProcLock,`
`1388`		`-proc)==STATUS_OK)`
	`1386`	`+proc->waitProcLock)==STATUS_OK)`
`1389`	`1387`	`{`
`1390`	`1388`	`/* OK to waken */`
`1391`	`1389`	`GrantLock(lock,proc->waitProcLock,lockmode);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);`
`503`	`503`	`externvoidPostPrepare_Locks(TransactionIdxid);`
`504`	`504`	`externintLockCheckConflicts(LockMethodlockMethodTable,`
`505`	`505`	`LOCKMODElockmode,`
`506`		`-LOCKlock,PROCLOCKproclock,PGPROC*proc);`
	`506`	`+LOCKlock,PROCLOCKproclock);`
`507`	`507`	`externvoidGrantLock(LOCKlock,PROCLOCKproclock,LOCKMODElockmode);`
`508`	`508`	`externvoidGrantAwaitedLock(void);`
`509`	`509`	`externvoidRemoveFromWaitQueue(PGPROC*proc,uint32hashcode);`

Comments

(0)