diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2020-11-25 17:44:15 +1300 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2020-11-25 17:55:49 +1300 |
| commit | a7e65dc88b6f088fc2fcf5a660d866de644b1300 (patch) | |
| tree | 6c5ab6e5b75d1becd9dd5c1f44d877446b6b921d /src | |
| parent | 805b816305b62cb3e2670418ced8f7184a2d29c7 (diff) | |
| download | postgresql-a7e65dc88b6f088fc2fcf5a660d866de644b1300.tar.gz postgresql-a7e65dc88b6f088fc2fcf5a660d866de644b1300.zip | |
Fix WaitLatch(NULL) on Windows.
Further to commit 733fa9aa, on Windows when a latch is triggered but we
aren't currently waiting for it, we need to locate the latch's HANDLE
rather 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/ipc/latch.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c index 24d44c982da..24afc47d513 100644 --- a/src/backend/storage/ipc/latch.c +++ b/src/backend/storage/ipc/latch.c @@ -1835,7 +1835,11 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout, if (cur_event->events == WL_LATCH_SET) { - if (!ResetEvent(set->latch->event)) + /* + * We cannot use set->latch->event to reset the fired event if we + * aren't waiting on this latch now. + */ + if (!ResetEvent(set->handles[cur_event->pos + 1])) elog(ERROR, "ResetEvent failed: error code %lu", GetLastError()); if (set->latch && set->latch->is_set) |