mirror of
https://github.com/postgres/postgres.git
synced 2025-07-15 19:21:59 +03:00
Clean up latch related code.
The larger part of this patch replaces usages of MyProc->procLatch with MyLatch. The latter works even early during backend startup, where MyProc->procLatch doesn't yet. While the affected code shouldn't run in cases where it's not initialized, it might get copied into places where it might. Using MyLatch is simpler and a bit faster to boot, so there's little point to stick with the previous coding. While doing so I noticed some weaknesses around newly introduced uses of latches that could lead to missed events, and an omitted CHECK_FOR_INTERRUPTS() call in worker_spi. As all the actual bugs are in v10 code, there doesn't seem to be sufficient reason to backpatch this. Author: Andres Freund Discussion: https://postgr.es/m/20170606195321.sjmenrfgl2nu6j63@alap3.anarazel.de https://postgr.es/m/20170606210405.sim3yl6vpudhmufo@alap3.anarazel.de Backpatch: -
This commit is contained in:
@ -191,7 +191,7 @@ wait_for_relation_state_change(Oid relid, char expected_state)
|
||||
if (!worker)
|
||||
return false;
|
||||
|
||||
rc = WaitLatch(&MyProc->procLatch,
|
||||
rc = WaitLatch(MyLatch,
|
||||
WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
|
||||
1000L, WAIT_EVENT_LOGICAL_SYNC_STATE_CHANGE);
|
||||
|
||||
@ -199,7 +199,7 @@ wait_for_relation_state_change(Oid relid, char expected_state)
|
||||
if (rc & WL_POSTMASTER_DEATH)
|
||||
proc_exit(1);
|
||||
|
||||
ResetLatch(&MyProc->procLatch);
|
||||
ResetLatch(MyLatch);
|
||||
}
|
||||
|
||||
return false;
|
||||
@ -236,7 +236,7 @@ wait_for_worker_state_change(char expected_state)
|
||||
if (MyLogicalRepWorker->relstate == expected_state)
|
||||
return true;
|
||||
|
||||
rc = WaitLatch(&MyProc->procLatch,
|
||||
rc = WaitLatch(MyLatch,
|
||||
WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
|
||||
1000L, WAIT_EVENT_LOGICAL_SYNC_STATE_CHANGE);
|
||||
|
||||
@ -244,7 +244,7 @@ wait_for_worker_state_change(char expected_state)
|
||||
if (rc & WL_POSTMASTER_DEATH)
|
||||
proc_exit(1);
|
||||
|
||||
ResetLatch(&MyProc->procLatch);
|
||||
ResetLatch(MyLatch);
|
||||
}
|
||||
|
||||
return false;
|
||||
@ -604,7 +604,7 @@ copy_read_data(void *outbuf, int minread, int maxread)
|
||||
/*
|
||||
* Wait for more data or latch.
|
||||
*/
|
||||
rc = WaitLatchOrSocket(&MyProc->procLatch,
|
||||
rc = WaitLatchOrSocket(MyLatch,
|
||||
WL_SOCKET_READABLE | WL_LATCH_SET |
|
||||
WL_TIMEOUT | WL_POSTMASTER_DEATH,
|
||||
fd, 1000L, WAIT_EVENT_LOGICAL_SYNC_DATA);
|
||||
@ -613,7 +613,7 @@ copy_read_data(void *outbuf, int minread, int maxread)
|
||||
if (rc & WL_POSTMASTER_DEATH)
|
||||
proc_exit(1);
|
||||
|
||||
ResetLatch(&MyProc->procLatch);
|
||||
ResetLatch(MyLatch);
|
||||
}
|
||||
|
||||
return bytesread;
|
||||
|
Reference in New Issue
Block a user