Commit2daa422

authored and

committed

Add detach after unsuccessful receives and checks on their after sends

1 parent46e09bc commit2daa422Copy full SHA for 2daa422

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,15 +210,25 @@ send_history(History observations, shm_mq_handle mqh)`
`210`	`210`	`{`
`211`	`211`	`Sizecount,`
`212`	`212`	`i;`
	`213`	`+shm_mq_resultmq_result;`
`213`	`214`
`214`	`215`	`if (observations->wraparound)`
`215`	`216`	`count=observations->count;`
`216`	`217`	`else`
`217`	`218`	`count=observations->index;`
`218`	`219`
`219`		`-shm_mq_send(mqh,sizeof(count),&count, false);`
	`220`	`+mq_result=shm_mq_send(mqh,sizeof(count),&count, false);`
	`221`	`+if (mq_result==SHM_MQ_DETACHED)`
	`222`	`+return;`
`220`	`223`	`for (i=0;i<count;i++)`
`221`		`-shm_mq_send(mqh,sizeof(HistoryItem),&observations->items[i], false);`
	`224`	`+{`
	`225`	`+mq_result=shm_mq_send(mqh,`
	`226`	`+sizeof(HistoryItem),`
	`227`	`+&observations->items[i],`
	`228`	`+false);`
	`229`	`+if (mq_result==SHM_MQ_DETACHED)`
	`230`	`+return;`
	`231`	`+}`
`222`	`232`	`}`
`223`	`233`
`224`	`234`	`/*`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,14 @@ receive_array(SHMRequest request, Size item_size, Size *count)`
`540`	`540`	`{`
`541`	`541`	`res=shm_mq_receive(mqh,&len,&data, false);`
`542`	`542`	`if (res!=SHM_MQ_SUCCESS\|\|len!=item_size)`
	`543`	`+{`
	`544`	`+#ifPG_VERSION_NUM >=100000`
	`545`	`+shm_mq_detach(mqh);`
	`546`	`+#else`
	`547`	`+shm_mq_detach(mq);`
	`548`	`+#endif`
`543`	`549`	`elog(ERROR,"Error reading mq.");`
	`550`	`+}`
`544`	`551`	`memcpy(ptr,data,item_size);`
`545`	`552`	`ptr+=item_size;`
`546`	`553`	`}`

Comments

(0)