Commit 962a4bb6 authored by Tom Lane's avatar Tom Lane

In copy_file, use a palloc'd buffer instead of just a local char array;

a local array isn't guaranteed to have any particular alignment, and
so it could slow down the data transfer.
parent fad7e8ed
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* as a service. * as a service.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/copydir.c,v 1.12 2005/08/02 19:02:32 tgl Exp $ * $PostgreSQL: pgsql/src/port/copydir.c,v 1.13 2005/09/02 18:55:32 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -88,11 +88,16 @@ copydir(char *fromdir, char *todir, bool recurse) ...@@ -88,11 +88,16 @@ copydir(char *fromdir, char *todir, bool recurse)
static void static void
copy_file(char *fromfile, char *tofile) copy_file(char *fromfile, char *tofile)
{ {
char buffer[8 * BLCKSZ]; char *buffer;
int srcfd; int srcfd;
int dstfd; int dstfd;
int nbytes; int nbytes;
/* Use palloc to ensure we get a maxaligned buffer */
#define COPY_BUF_SIZE (8 * BLCKSZ)
buffer = palloc(COPY_BUF_SIZE);
/* /*
* Open the files * Open the files
*/ */
...@@ -114,7 +119,7 @@ copy_file(char *fromfile, char *tofile) ...@@ -114,7 +119,7 @@ copy_file(char *fromfile, char *tofile)
*/ */
for (;;) for (;;)
{ {
nbytes = read(srcfd, buffer, sizeof(buffer)); nbytes = read(srcfd, buffer, COPY_BUF_SIZE);
if (nbytes < 0) if (nbytes < 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
...@@ -147,4 +152,6 @@ copy_file(char *fromfile, char *tofile) ...@@ -147,4 +152,6 @@ copy_file(char *fromfile, char *tofile)
errmsg("could not close file \"%s\": %m", tofile))); errmsg("could not close file \"%s\": %m", tofile)));
close(srcfd); close(srcfd);
pfree(buffer);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment