mirror of
https://github.com/postgres/postgres.git
synced 2025-06-25 01:02:05 +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:
@ -1146,7 +1146,7 @@ LogicalRepApplyLoop(XLogRecPtr last_received)
|
||||
/*
|
||||
* 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, NAPTIME_PER_CYCLE,
|
||||
@ -1156,6 +1156,12 @@ LogicalRepApplyLoop(XLogRecPtr last_received)
|
||||
if (rc & WL_POSTMASTER_DEATH)
|
||||
proc_exit(1);
|
||||
|
||||
if (rc & WL_LATCH_SET)
|
||||
{
|
||||
ResetLatch(MyLatch);
|
||||
CHECK_FOR_INTERRUPTS();
|
||||
}
|
||||
|
||||
if (got_SIGHUP)
|
||||
{
|
||||
got_SIGHUP = false;
|
||||
@ -1209,8 +1215,6 @@ LogicalRepApplyLoop(XLogRecPtr last_received)
|
||||
|
||||
send_feedback(last_received, requestReply, requestReply);
|
||||
}
|
||||
|
||||
ResetLatch(&MyProc->procLatch);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user