Replace memcpy with memmove

knizhnik · knizhnik · commit 4c26d458fd04 · 2015-10-26T18:44:33.000+03:00
diff --git a/contrib/pg_dtm/sockhub/sockhub.c b/contrib/pg_dtm/sockhub/sockhub.c
@@ -367,7 +367,7 @@ void ShubLoop(Shub* shub)
                                 }
                             }
                             /* Move partly fetched message header (if any) to the beginning of buffer */
-                            memcpy(shub->out_buffer, shub->out_buffer + pos, available - pos);
+                            memmove(shub->out_buffer, shub->out_buffer + pos, available - pos);
                             shub->out_buffer_used = available - pos;
                         } else { /* receive request from client */
                             int chan = i;
@@ -454,7 +454,7 @@ void ShubLoop(Shub* shub)
                                         shub->params->error_handler("Failed to write to inet socket", SHUB_RECOVERABLE_ERROR);
                                         reconnect(shub);
                                     }
-                                    memcpy(shub->in_buffer, shub->in_buffer + pos, available -= pos);
+                                    memmove(shub->in_buffer, shub->in_buffer + pos, available -= pos);
                                     pos = 0;
                                 } else {
                                     available -= pos;
diff --git a/contrib/pg_dtm/sockhub/start-async-clients.sh b/contrib/pg_dtm/sockhub/start-async-clients.sh
@@ -1,4 +1,4 @@
-n_clients=10
+n_clients=8
 n_iters=10000
 pkill -9 sockub
 pkill -9 test-async-client
diff --git a/contrib/pg_dtm/sockhub/test-server.c b/contrib/pg_dtm/sockhub/test-server.c
@@ -93,7 +93,7 @@ int main(int argc, char* argv[])
                                 if (msg->hdr.code == MSG_DISCONNECT) { 
                                     assert(msg->hdr.size == 0);
                                     printf("Disconnect client [%d:%d]\n", i, msg->hdr.chan);
-                                    memcpy(buf + pos, buf + pos + sizeof(ShubMessageHdr), available - pos - sizeof(ShubMessageHdr));
+                                    memmove(buf + pos, buf + pos + sizeof(ShubMessageHdr), available - pos - sizeof(ShubMessageHdr));
                                     available -= sizeof(ShubMessageHdr);
                                 } else {                                     
                                     assert(sizeof(ShubMessageHdr) + msg->hdr.size == sizeof(Message));

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ void ShubLoop(Shub* shub)`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`/* Move partly fetched message header (if any) to the beginning of buffer */`
`370`		`- memcpy(shub->out_buffer, shub->out_buffer + pos, available - pos);`
	`370`	`+ memmove(shub->out_buffer, shub->out_buffer + pos, available - pos);`
`371`	`371`	`shub->out_buffer_used = available - pos;`
`372`	`372`	`} else { /* receive request from client */`
`373`	`373`	`int chan = i;`
`@@ -454,7 +454,7 @@ void ShubLoop(Shub* shub)`
`454`	`454`	`shub->params->error_handler("Failed to write to inet socket", SHUB_RECOVERABLE_ERROR);`
`455`	`455`	`reconnect(shub);`
`456`	`456`	`}`
`457`		`- memcpy(shub->in_buffer, shub->in_buffer + pos, available -= pos);`
	`457`	`+ memmove(shub->in_buffer, shub->in_buffer + pos, available -= pos);`
`458`	`458`	`pos = 0;`
`459`	`459`	`} else {`
`460`	`460`	`available -= pos;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-n_clients=10`
	`1`	`+n_clients=8`
`2`	`2`	`n_iters=10000`
`3`	`3`	`pkill -9 sockub`
`4`	`4`	`pkill -9 test-async-client`