NotificationsYou must be signed in to change notification settings
Fork27
Star157

Commitbd92be0

Daniel Shelepanov

committed

[PGPRO-5146] Byte manipulations with Size fixed in send/receive_msg_by_parts

On 64-bit architectures sizeof(Size) (which is in fact size_t)not always equals to sizeof(int) so the Size type manipulations insend/receive_msg_by_parts should be implemented using the Size typeexplicitly.tags: pg_query_state

1 parent1ca39b9 commitbd92be0Copy full SHA for bd92be0

File tree

2 files changed

-4

lines changed

2 files changed

-4

lines changed

`‎pg_query_state.c‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -972,16 +972,16 @@ receive_msg_by_parts(shm_mq_handle mqh, Size total, void **datap,`
`972`	`972`	`shm_mq_resultmq_receive_result;`
`973`	`973`	`shm_mq_msg*buff;`
`974`	`974`	`intoffset;`
`975`		`-int*expected;`
`976`		`-intexpected_data;`
	`975`	`+Size*expected;`
	`976`	`+Sizeexpected_data;`
`977`	`977`	`Sizelen;`
`978`	`978`
`979`	`979`	`/* Get the expected number of bytes in message */`
`980`	`980`	`mq_receive_result=shm_mq_receive(mqh,&len, (void**)&expected,nowait);`
`981`	`981`	`expected_data=*expected;`
`982`	`982`	`if (mq_receive_result!=SHM_MQ_SUCCESS)`
`983`	`983`	`returnmq_receive_result;`
`984`		`-Assert(len==sizeof(int));`
	`984`	`+Assert(len==sizeof(Size));`
`985`	`985`
`986`	`986`	`*datap=palloc0(expected_data);`
`987`	`987`

`‎signal_handler.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ send_msg_by_parts(shm_mq_handle mqh, Size nbytes, const void data)`
`159`	`159`	`intoffset;`
`160`	`160`
`161`	`161`	`/* Send the expected message length */`
`162`		`-shm_mq_send(mqh,sizeof(int),&nbytes, false);`
	`162`	`+shm_mq_send(mqh,sizeof(Size),&nbytes, false);`
`163`	`163`
`164`	`164`	`for (offset=0;offset<nbytes;offset+=bytes_send)`
`165`	`165`	`{`

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!

Commitbd92be0

File tree

2 files changed

2 files changed

`‎pg_query_state.c‎`

`‎signal_handler.c‎`

0 commit comments