Consistently allow reading of messages from a detached shm_mq.

robertmhaas · robertmhaas · commit 5ec45bb7fa0a · 2014-04-30T17:38:18.000-04:00
This was intended to work always, but the previous code only allowed
it if at least one message was successfully read by the receiver
before the sender detached the queue.

Report by Petr Jelinek.  Patch by me.
diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c
@@ -406,7 +406,8 @@ shm_mq_receive(shm_mq_handle *mqh, Size *nbytesp, void **datap, bool nowait)
 			if (shm_mq_get_sender(mq) == NULL)
 				return SHM_MQ_WOULD_BLOCK;
 		}
-		else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle))
+		else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle)
+				 && shm_mq_get_sender(mq) == NULL)
 		{
 			mq->mq_detached = true;
 			return SHM_MQ_DETACHED;

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,8 @@ shm_mq_receive(shm_mq_handle mqh, Size nbytesp, void **datap, bool nowait)`
`406`	`406`	`if (shm_mq_get_sender(mq) == NULL)`
`407`	`407`	`return SHM_MQ_WOULD_BLOCK;`
`408`	`408`	`}`
`409`		`- else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle))`
	`409`	`+ else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle)`
	`410`	`+ && shm_mq_get_sender(mq) == NULL)`
`410`	`411`	`{`
`411`	`412`	`mq->mq_detached = true;`
`412`	`413`	`return SHM_MQ_DETACHED;`