Commit6f97f22

committed

Correctly handle lock failure in MtmLock

1 parent55b72ac commit6f97f22Copy full SHA for 6f97f22

File tree

-6

lines changed

-6

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -317,19 +317,22 @@ void MtmLock(LWLockMode mode)`
`317`	`317`	`atexit(MtmReleaseLocks);`
`318`	`318`	`MtmAtExitHookRegistered= true;`
`319`	`319`	`}`
`320`		`-if (mode==LW_EXCLUSIVE\|\|MtmLockCount!=0) {`
`321`		`-if (MtmLockCount++!=0) {`
`322`		`-Assert(Mtm->lastLockHolder==MyProcPid);`
`323`		`-return;`
`324`		`-}`
	`320`	`+if (MtmLockCount!=0) {`
	`321`	`+Assert(Mtm->lastLockHolder==MyProcPid);`
	`322`	`+MtmLockCount+=1;`
	`323`	`+return;`
`325`	`324`	`}`
`326`	`325`	`start=MtmGetSystemTime();`
`327`	`326`	`LWLockAcquire((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID],mode);`
`328`	`327`	`stop=MtmGetSystemTime();`
`329`	`328`	`if (stop>start+MSEC_TO_USEC(MtmHeartbeatSendTimeout)) {`
`330`	`329`	`MTM_LOG1("%d: obtaining %s lock takes %lld microseconds",MyProcPid, (mode==LW_EXCLUSIVE ?"exclusive" :"shared"),stop-start);`
`331`	`330`	`}`
`332`		`-Mtm->lastLockHolder=MyProcPid;`
	`331`	`+if (mode==LW_EXCLUSIVE) {`
	`332`	`+Assert(MtmLockCount==0);`
	`333`	`+Mtm->lastLockHolder=MyProcPid;`
	`334`	`+MtmLockCount=1;`
	`335`	`+}`
`333`	`336`	`}`
`334`	`337`
`335`	`338`	`voidMtmUnlock(void)`

Comments

(0)