database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00
Code Activity

Fix WaitLatchOrSocket to handle EOF on socket correctly.

Browse Source 
When using poll(), EOF on a socket is reported with the POLLHUP not
POLLIN flag (at least on Linux).  WaitLatchOrSocket failed to check
this bit, causing it to go into a busy-wait loop if EOF occurs.
We earlier fixed the same mistake in the test for the state of the
postmaster_alive socket, but missed it for the caller-supplied socket.
Fortunately, this error is new in 9.2, since 9.1 only had a select()
based code path not a poll() based one.
This commit is contained in:
Tom Lane
2012-05-12 16:36:47 -04:00
parent d36eaa2167
commit 31ad655364
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/port/unix_latch.c
View File

@ -293,7 +293,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
result |= WL_TIMEOUT; result |= WL_TIMEOUT;
} }
if ((wakeEvents & WL_SOCKET_READABLE) && if ((wakeEvents & WL_SOCKET_READABLE) &&
(pfds[0].revents & POLLIN)) (pfds[0].revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL)))
{ {
/* data available in socket */ /* data available in socket */
result |= WL_SOCKET_READABLE; result |= WL_SOCKET_READABLE;