Commita7e65dc

committed

Fix WaitLatch(NULL) on Windows.

Further to commit733fa9a, on Windows when a latch is triggered but wearen't currently waiting for it, we need to locate the latch's HANDLErather than calling ResetEvent(NULL).Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>Reported-by: Ranier Vilela <ranier.vf@gmail.com>Discussion:https://postgr.es/m/CAEudQArTPi1YBc%2Bn1fo0Asy3QBFhVjp_QgyKG-8yksVn%2ByRTiw%40mail.gmail.com

1 parent805b816 commita7e65dcCopy full SHA for a7e65dc

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1835,7 +1835,11 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,`
`1835`	`1835`
`1836`	`1836`	`if (cur_event->events==WL_LATCH_SET)`
`1837`	`1837`	`{`
`1838`		`-if (!ResetEvent(set->latch->event))`
	`1838`	`+/*`
	`1839`	`+ * We cannot use set->latch->event to reset the fired event if we`
	`1840`	`+ * aren't waiting on this latch now.`
	`1841`	`+ */`
	`1842`	`+if (!ResetEvent(set->handles[cur_event->pos+1]))`
`1839`	`1843`	`elog(ERROR,"ResetEvent failed: error code %lu",GetLastError());`
`1840`	`1844`
`1841`	`1845`	`if (set->latch&&set->latch->is_set)`

Comments

(0)