Commit016abf1

committed

Add debug check function LWLockHeldByMeInMode()

Tests whether my process holds a lock in given mode.Add initial usage in MarkBufferDirty().Thomas Munro

1 parentec03f41 commit016abf1Copy full SHA for 016abf1

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1460,8 +1460,8 @@ MarkBufferDirty(Buffer buffer)`
`1460`	`1460`	`bufHdr=GetBufferDescriptor(buffer-1);`
`1461`	`1461`
`1462`	`1462`	`Assert(BufferIsPinned(buffer));`
`1463`		`-/* unfortunately we can't check if the lock is held exclusively */`
`1464`		`-Assert(LWLockHeldByMe(BufferDescriptorGetContentLock(bufHdr)));`
	`1463`	`+Assert(LWLockHeldByMeInMode(BufferDescriptorGetContentLock(bufHdr),`
	`1464`	`+LW_EXCLUSIVE));`
`1465`	`1465`
`1466`	`1466`	`old_buf_state=pg_atomic_read_u32(&bufHdr->state);`
`1467`	`1467`	`for (;;)`

Lines changed: 20 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1880,10 +1880,9 @@ LWLockReleaseAll(void)`
`1880`	`1880`
`1881`	`1881`
`1882`	`1882`	`/*`
`1883`		`- * LWLockHeldByMe - test whether my processcurrentlyholds a lock`
	`1883`	`+ * LWLockHeldByMe - test whether my process holds a lock in any mode`
`1884`	`1884`	`*`
`1885`		`- * This is meant as debug support only. We currently do not distinguish`
`1886`		`- * whether the lock is held shared or exclusive.`
	`1885`	`+ * This is meant as debug support only.`
`1887`	`1886`	`*/`
`1888`	`1887`	`bool`
`1889`	`1888`	`LWLockHeldByMe(LWLock*l)`
`@@ -1897,3 +1896,21 @@ LWLockHeldByMe(LWLock *l)`
`1897`	`1896`	`}`
`1898`	`1897`	`return false;`
`1899`	`1898`	`}`
	`1899`	`+`
	`1900`	`+/*`
	`1901`	`+ * LWLockHeldByMeInMode - test whether my process holds a lock in given mode`
	`1902`	`+ *`
	`1903`	`+ * This is meant as debug support only.`
	`1904`	`+ */`
	`1905`	`+bool`
	`1906`	`+LWLockHeldByMeInMode(LWLock*l,LWLockModemode)`
	`1907`	`+{`
	`1908`	`+inti;`
	`1909`	`+`
	`1910`	`+for (i=0;i<num_held_lwlocks;i++)`
	`1911`	`+{`
	`1912`	`+if (held_lwlocks[i].lock==l&&held_lwlocks[i].mode==mode)`
	`1913`	`+return true;`
	`1914`	`+}`
	`1915`	`+return false;`
	`1916`	`+}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ extern void LWLockRelease(LWLock *lock);`
`175`	`175`	`externvoidLWLockReleaseClearVar(LWLocklock,uint64valptr,uint64val);`
`176`	`176`	`externvoidLWLockReleaseAll(void);`
`177`	`177`	`externboolLWLockHeldByMe(LWLock*lock);`
	`178`	`+externboolLWLockHeldByMeInMode(LWLock*lock,LWLockModemode);`
`178`	`179`
`179`	`180`	`externboolLWLockWaitForVar(LWLocklock,uint64valptr,uint64oldval,uint64*newval);`
`180`	`181`	`externvoidLWLockUpdateVar(LWLocklock,uint64valptr,uint64value);`

Comments

(0)