Skip to content

P
Postgres FD Implementation
Commit 46117e4f authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Have test_fsync honor -f filename argument.

parent 698ee9c3
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
src/tools/fsync/test_fsync.c
View file @ 46117e4f
...@@ -58,7 +58,7 @@ main(int argc, char *argv[]) ...@@ -58,7 +58,7 @@ main(int argc, char *argv[])
for (i = 0; i < WAL_FILE_SIZE; i++) for (i = 0; i < WAL_FILE_SIZE; i++)
strout[i] = 'a'; strout[i] = 'a';
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) == -1) if ((tmpfile = open(filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
write(tmpfile, strout, WAL_FILE_SIZE); write(tmpfile, strout, WAL_FILE_SIZE);
fsync(tmpfile); /* fsync so later fsync's don't have to do it */ fsync(tmpfile); /* fsync so later fsync's don't have to do it */
...@@ -69,7 +69,7 @@ main(int argc, char *argv[]) ...@@ -69,7 +69,7 @@ main(int argc, char *argv[])
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
{ {
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
write(tmpfile, strout, 8192); write(tmpfile, strout, 8192);
close(tmpfile); close(tmpfile);
...@@ -86,12 +86,12 @@ main(int argc, char *argv[]) ...@@ -86,12 +86,12 @@ main(int argc, char *argv[])
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
{ {
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
write(tmpfile, strout, 8192); write(tmpfile, strout, 8192);
fsync(tmpfile); fsync(tmpfile);
close(tmpfile); close(tmpfile);
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
/* do nothing but the open/close the tests are consistent. */ /* do nothing but the open/close the tests are consistent. */
close(tmpfile); close(tmpfile);
...@@ -105,12 +105,12 @@ main(int argc, char *argv[]) ...@@ -105,12 +105,12 @@ main(int argc, char *argv[])
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
{ {
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
write(tmpfile, strout, 8192); write(tmpfile, strout, 8192);
close(tmpfile); close(tmpfile);
/* reopen file */ /* reopen file */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
fsync(tmpfile); fsync(tmpfile);
close(tmpfile); close(tmpfile);
...@@ -123,7 +123,7 @@ main(int argc, char *argv[]) ...@@ -123,7 +123,7 @@ main(int argc, char *argv[])
printf("\nCompare one o_sync write to two:\n"); printf("\nCompare one o_sync write to two:\n");
/* 16k o_sync write */ /* 16k o_sync write */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | OPEN_SYNC_FLAG)) == -1) if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -135,7 +135,7 @@ main(int argc, char *argv[]) ...@@ -135,7 +135,7 @@ main(int argc, char *argv[])
printf("\n"); printf("\n");
/* 2*8k o_sync writes */ /* 2*8k o_sync writes */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | OPEN_SYNC_FLAG)) == -1) if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -153,7 +153,7 @@ main(int argc, char *argv[]) ...@@ -153,7 +153,7 @@ main(int argc, char *argv[])
#ifdef OPEN_DATASYNC_FLAG #ifdef OPEN_DATASYNC_FLAG
/* open_dsync, write */ /* open_dsync, write */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | O_DSYNC)) == -1) if ((tmpfile = open(filename, O_RDWR | O_DSYNC)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -168,7 +168,7 @@ main(int argc, char *argv[]) ...@@ -168,7 +168,7 @@ main(int argc, char *argv[])
printf("\n"); printf("\n");
/* open_fsync, write */ /* open_fsync, write */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | OPEN_SYNC_FLAG)) == -1) if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -181,7 +181,7 @@ main(int argc, char *argv[]) ...@@ -181,7 +181,7 @@ main(int argc, char *argv[])
#ifdef HAVE_FDATASYNC #ifdef HAVE_FDATASYNC
/* write, fdatasync */ /* write, fdatasync */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -199,7 +199,7 @@ main(int argc, char *argv[]) ...@@ -199,7 +199,7 @@ main(int argc, char *argv[])
printf("\n"); printf("\n");
/* write, fsync, close */ /* write, fsync, close */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -217,7 +217,7 @@ main(int argc, char *argv[]) ...@@ -217,7 +217,7 @@ main(int argc, char *argv[])
#ifdef OPEN_DATASYNC_FLAG #ifdef OPEN_DATASYNC_FLAG
/* open_dsync, write */ /* open_dsync, write */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | O_DSYNC)) == -1) if ((tmpfile = open(filename, O_RDWR | O_DSYNC)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -235,7 +235,7 @@ main(int argc, char *argv[]) ...@@ -235,7 +235,7 @@ main(int argc, char *argv[])
printf("\n"); printf("\n");
/* open_fsync, write */ /* open_fsync, write */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR | OPEN_SYNC_FLAG)) == -1) if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -251,7 +251,7 @@ main(int argc, char *argv[]) ...@@ -251,7 +251,7 @@ main(int argc, char *argv[])
#ifdef HAVE_FDATASYNC #ifdef HAVE_FDATASYNC
/* write, fdatasync */ /* write, fdatasync */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -270,7 +270,7 @@ main(int argc, char *argv[]) ...@@ -270,7 +270,7 @@ main(int argc, char *argv[])
printf("\n"); printf("\n");
/* write, fsync, close */ /* write, fsync, close */
if ((tmpfile = open(FSYNC_FILENAME, O_RDWR)) == -1) if ((tmpfile = open(filename, O_RDWR)) == -1)
die("can't open /var/tmp/test_fsync.out"); die("can't open /var/tmp/test_fsync.out");
gettimeofday(&start_t, NULL); gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++) for (i = 0; i < loops; i++)
...@@ -285,7 +285,7 @@ main(int argc, char *argv[]) ...@@ -285,7 +285,7 @@ main(int argc, char *argv[])
print_elapse(start_t, elapse_t); print_elapse(start_t, elapse_t);
printf("\n"); printf("\n");
unlink(FSYNC_FILENAME); unlink(filename);
return 0; return 0;
} }
......
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