NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5eca6cf

committed

shm_mq: Repair breakage from previous commit.

If the counterparty writes some data into the queue and then detaches,it's wrong to return SHM_MQ_DETACHED right away. If we do that, wefail to read whatever was written.

1 parent87abcb4 commit5eca6cfCopy full SHA for 5eca6cf

File tree

1 file changed

-2

lines changed

src/backend/storage/ipc
- shm_mq.c

1 file changed

-2

lines changed

`‎src/backend/storage/ipc/shm_mq.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -405,10 +405,12 @@ shm_mq_receive(shm_mq_handle mqh, Size nbytesp, void **datap, bool nowait)`
`405`	`405`	`{`
`406`	`406`	`if (nowait)`
`407`	`407`	`{`
`408`		`-if (shm_mq_counterparty_gone(mq,mqh->mqh_handle))`
`409`		`-returnSHM_MQ_DETACHED;`
`410`	`408`	`if (shm_mq_get_sender(mq)==NULL)`
	`409`	`+{`
	`410`	`+if (shm_mq_counterparty_gone(mq,mqh->mqh_handle))`
	`411`	`+returnSHM_MQ_DETACHED;`
`411`	`412`	`returnSHM_MQ_WOULD_BLOCK;`
	`413`	`+}`
`412`	`414`	`}`
`413`	`415`	`elseif (!shm_mq_wait_internal(mq,&mq->mq_sender,mqh->mqh_handle)`
`414`	`416`	`&&shm_mq_get_sender(mq)==NULL)`

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!

Commit5eca6cf

File tree

1 file changed

1 file changed

`‎src/backend/storage/ipc/shm_mq.c`

0 commit comments