NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitb2b4af5

committed

Fix poll() implementation of WaitLatchOrSocket to notice postmaster death.

When the remote end of the pipe is closed, select() reports the fd asreadable, but poll() has a separate POLLHUP return code for that.Spotted by Peter Geoghegan.

1 parent0495aaa commitb2b4af5Copy full SHA for b2b4af5

File tree

1 file changed

-1

lines changed

src/backend/port
- unix_latch.c

1 file changed

-1

lines changed

`‎src/backend/port/unix_latch.c‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -310,8 +310,13 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,`
`310`	`310`	`{`
`311`	`311`	`result \|=WL_SOCKET_WRITEABLE;`
`312`	`312`	`}`
	`313`	`+/*`
	`314`	`+ * We expect a POLLHUP when the remote end is closed, but because we`
	`315`	`+ * don't expect the pipe to become readable or to have any errors`
	`316`	`+ * either, treat those as postmaster death, too.`
	`317`	`+ */`
`313`	`318`	`if ((wakeEvents&WL_POSTMASTER_DEATH)&&`
`314`		`-(pfds[nfds-1].revents&POLLIN))`
	`319`	`+(pfds[nfds-1].revents&(POLLHUP \|POLLIN \|POLLERR \|POLLNVAL)))`
`315`	`320`	`{`
`316`	`321`	`result \|=WL_POSTMASTER_DEATH;`
`317`	`322`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb2b4af5

File tree

1 file changed

1 file changed

`‎src/backend/port/unix_latch.c‎`

0 commit comments